105 changed files with 1062 additions and 3402 deletions
--- a/.changes/unreleased/.gitkeep
+++ b/.changes/unreleased/.gitkeep
@ -1 +0,0 @@
-*.yaml
--- a/.changes/unreleased/Added-20250409-174528.yaml
+++ b/.changes/unreleased/Added-20250409-174528.yaml
@ -1,3 +0,0 @@
-kind: Added
-body: 'feat: Package operation `versionCheck` supports regular expressions (see [regexp](https://pkg.go.dev/regexp) package for docs)'
-time: 2025-04-09T17:45:28.836497149-05:00
--- a/.changes/unreleased/Added-20250501-110745.yaml
+++ b/.changes/unreleased/Added-20250501-110745.yaml
@ -1,3 +0,0 @@
-kind: Added
-body: 'Command lists: added `cmdLists.[name].notify` object'
-time: 2025-05-01T11:07:45.96164753-05:00
--- a/.changes/unreleased/Added-20250704-085917.yaml
+++ b/.changes/unreleased/Added-20250704-085917.yaml
@ -1,3 +0,0 @@
-kind: Added
-body: Testing setup with Docker
-time: 2025-07-04T08:59:17.430373451-05:00
--- a/.changes/unreleased/Added-20250704-102126.yaml
+++ b/.changes/unreleased/Added-20250704-102126.yaml
@ -1,3 +0,0 @@
-kind: Added
-body: 'CLI: add global flag --hostsConfig that allows hosts to be dynamic in relation to the main config'
-time: 2025-07-04T10:21:26.864635558-05:00
--- a/.changes/unreleased/Changed-20250321-090849.yaml
+++ b/.changes/unreleased/Changed-20250321-090849.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: 'Commands: `host` can now be `localhost` or `127.0.0.1` to run commands locally'
-time: 2025-03-21T09:08:49.871021144-05:00
--- a/.changes/unreleased/Changed-20250325-003357.yaml
+++ b/.changes/unreleased/Changed-20250325-003357.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: lists loaded from external files only if no list config present in current file
-time: 2025-03-25T00:33:57.039431409-05:00
--- a/.changes/unreleased/Changed-20250407-223020.yaml
+++ b/.changes/unreleased/Changed-20250407-223020.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: "`PackageManager.Parse` renamed to `ParseRemotePackageManagerVersionOutput`. This now returns arrays of PackageManagerCommon.Package and errors."
-time: 2025-04-07T22:30:20.342177323-05:00
--- a/.changes/unreleased/Changed-20250418-133440.yaml
+++ b/.changes/unreleased/Changed-20250418-133440.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: 'Internal: refactoring and renaming functions'
-time: 2025-04-18T13:34:40.842541658-05:00
--- a/.changes/unreleased/Changed-20250501-110534.yaml
+++ b/.changes/unreleased/Changed-20250501-110534.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: 'Commands: moved output-prefixed keys to the `commands.[name].output` object'
-time: 2025-05-01T11:05:34.90130087-05:00
--- a/.changes/unreleased/Changed-20250609-072601.yaml
+++ b/.changes/unreleased/Changed-20250609-072601.yaml
@ -1,3 +0,0 @@
-kind: Changed
-body: Change internal method name for better understanding
-time: 2025-06-09T07:26:01.819927627-05:00
--- a/.changes/unreleased/Fixed-20250418-095747.yaml
+++ b/.changes/unreleased/Fixed-20250418-095747.yaml
@ -1,3 +0,0 @@
-kind: Fixed
-body: 'Command Lists: hooks now run correctly when commands finish'
-time: 2025-04-18T09:57:47.39035092-05:00
--- a/.changes/unreleased/Fixed-20250424-225711.yaml
+++ b/.changes/unreleased/Fixed-20250424-225711.yaml
@ -1,3 +0,0 @@
-kind: Fixed
-body: Log file passed using `--log-file` correctly used
-time: 2025-04-24T22:57:11.592829277-05:00
--- a/.changes/v0.10.0.md
+++ b/.changes/v0.10.0.md
@ -1,16 +0,0 @@
-## v0.10.0 - 2025-03-08
-### Added
-* Hooks: improved logging when executing
-* User commands: adding SSH keys using config key `userSshPubKeys`
-* directives: added support for fetching values using directive `%{externalSource:key}%`
-### Changed
-* Commands: if dir is not specified, run in config dir
-* FileDirective: use the config directory if path is not absolute
-* Host: changes to case of some keys
-* Notifications: added external directive to sensitive keys
-### Fixed
-* LocalFetcher: return fetch error
-* Lists: load file key before attempting to load from current file
-* fix: host not in config file, but in ssh config, properly added to hosts struct
-* SSH: password authentication bugs
-* User commands: change user password works
--- a/.changes/v0.10.1.md
+++ b/.changes/v0.10.1.md
@ -1,8 +0,0 @@
-## v0.10.1 - 2025-03-11
-### Added
-* UserCommands: add ssh public keys when running locally
-* UserCommands: add field CreateUserHome
-### Changed
-* UserCommands: create temp file when modifing password over SSH
-* UserCommands: change field name
-* Vault: keys are now referenced by `name`, and the actual data by `data`
--- a/.changes/v0.10.2.md
+++ b/.changes/v0.10.2.md
@ -1,6 +0,0 @@
-## v0.10.2 - 2025-03-19
-### Added
-* Notifications: http service added
-* Variable support. Can be referenced with `%{var:nameOfVar}%` in select string fields.
-### Changed
-* vault: initialize vault before validating config
--- a/.changes/v0.7.1.md
+++ b/.changes/v0.7.1.md
@ -1,3 +0,0 @@
-## v0.7.1 - 2025-02-14
-### Fixed
-* Incorrect local config file loading logic caused files to not be detected
--- a/.changes/v0.7.2.md
+++ b/.changes/v0.7.2.md
@ -1,3 +0,0 @@
-## v0.7.2 - 2025-02-14
-### Fixed
-* CI configs
--- a/.changes/v0.7.3.md
+++ b/.changes/v0.7.3.md
@ -1,3 +0,0 @@
-## v0.7.3 - 2025-02-14
-### Changed
-* GoReleaser configs
--- a/.changes/v0.7.4.md
+++ b/.changes/v0.7.4.md
@ -1,5 +0,0 @@
-## v0.7.4 - 2025-02-14
-### Changed
-* CI configs
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
--- a/.changes/v0.7.5.md
+++ b/.changes/v0.7.5.md
@ -1,5 +0,0 @@
-## v0.7.5 - 2025-02-14
-### Changed
-* CI configs
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
--- a/.changes/v0.7.6.md
+++ b/.changes/v0.7.6.md
@ -1,4 +0,0 @@
-## v0.7.6 - 2025-02-14
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-* CI configs
--- a/.changes/v0.7.7.md
+++ b/.changes/v0.7.7.md
@ -1,4 +0,0 @@
-## v0.7.7 - 2025-02-14
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-* CI configs
--- a/.changes/v0.7.8.md
+++ b/.changes/v0.7.8.md
@ -1,4 +0,0 @@
-## v0.7.8 - 2025-02-14
-### Fixed
-* Github CI config
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
--- a/.changes/v0.8.0.md
+++ b/.changes/v0.8.0.md
@ -1,6 +0,0 @@
-## v0.8.0 - 2025-02-15
-### Changed
-* Breaking: `cmd-lists` key changed to `cmdLists`
-* Properly load list config
-* Config file loading properly errors
-* CI Configs
--- a/.changes/v0.9.0.md
+++ b/.changes/v0.9.0.md
@ -1,12 +0,0 @@
-## v0.9.0 - 2025-02-28
-### Added
-* `list` command with subcommands `cmds` and `lists`
-* Deprecation and unsupported warnings for old config keys
-* CLI flag `--cmdStdOut` to output command's stdout/stderr to stdout
-* Command type `remoteScript`. See docs for more info.
-### Changed
-* change to enums for Command type
-* Cache now stores resources by URL hash for ease-of-lookup
-* Changed PackageOperation to enums
-### Fixed
-* Local command's `dir` full path is now found with home directory
--- a/.changes/v0.9.1.md
+++ b/.changes/v0.9.1.md
@ -1,3 +0,0 @@
-## v0.9.1 - 2025-03-01
-### Changed
-* Use EnvVar AWS_PROFILE to get S3 profile
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -15,26 +15,26 @@ jobs:
  goreleaser:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v3
        with:
          fetch-depth: 0
      - run: git fetch --force --tags
-      - uses: actions/setup-go@v5
+      - uses: actions/setup-go@v4
        with:
-          go-version: '1.23'
+          go-version: '1.20'
          cache: true
      # More assembly might be required: Docker logins, GPG, etc. It all depends
      # on your needs.
-      - uses: olegtarasov/get-tag@v2.1.4
-        id: tagName
+      - name: Get tag
+        id: tag
+        uses: dawidd6/action-get-tag@v1
        with:
-          # tagRegex: "foobar-(.*)"  # Optional. Returns specified group text as tag name. Full tag string is returned if regex is not defined.
-          tagRegexGroup: 1 # Optional. Default is 1.
-      - uses: goreleaser/goreleaser-action@v6
+          # Optionally strip `v` prefix
+          strip_v: false
+      - uses: goreleaser/goreleaser-action@v4
        with:
          distribution: goreleaser
-          version: 2.7.0
-          args: release --release-notes=".changes/${{ env.GIT_TAG_NAME }}.md" -f .goreleaser/github.yml --clean
+          version: latest
+          args: release --release-notes=".changes/${{steps.tag.outputs.tag}}.md" -f .goreleaser/github.yml --clean
        env:
          GITHUB_TOKEN: ${{ secrets.GORELEASER_TOKEN }}
-          GIT_TAG_NAME: ${{ steps.tagName.outputs.tag }}
--- a/.gitignore
+++ b/.gitignore
@ -1,10 +1,6 @@
-!.changie.yaml
-!.changes/**

 dist/
 .codegpt

 *.log
-/*.sh
-/*.yaml
-/*.yml
+*.sh
--- a/.goreleaser/gitea.yml
+++ b/.goreleaser/gitea.yml
@ -6,6 +6,7 @@ before:
 builds:
  - env:
      - CGO_ENABLED=0
+      - GOPROXY=https://goproxy.io
    goos:
      - freebsd
      - linux
@ -15,7 +16,7 @@ builds:
      - arm64

 archives:
-  - formats: tar.gz
+  - format: tar.gz
    # this name template makes the OS and Arch compatible with the results of uname.
    name_template: >-
      {{ .ProjectName }}_{{ .Version }}_
@ -27,7 +28,7 @@ archives:
    # use zip for windows archives
    format_overrides:
    - goos: windows
-      formats: [zip]
+      format: zip
 checksum:
  name_template: 'checksums.txt'
 snapshot:
--- a/.goreleaser/github.yml
+++ b/.goreleaser/github.yml
@ -1,3 +1,4 @@
+# This is an example .goreleaser.yml file with some sensible defaults.
 # Make sure to check the documentation at https://goreleaser.com
 version: 2
 before:
@ -16,7 +17,7 @@ builds:
      - arm64

 archives:
-  - formats: tar.gz
+  - format: tar.gz
    # this name template makes the OS and Arch compatible with the results of uname.
    name_template: >-
      {{ .ProjectName }}_{{ .Version }}_
@ -28,7 +29,7 @@ archives:
    # use zip for windows archives
    format_overrides:
    - goos: windows
-      formats: [zip]
+      format: zip
 checksum:
  name_template: 'checksums.txt'
 snapshot:
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@ -9,6 +9,5 @@
        "mautrix",
        "nikoksr",
        "Strs"
-    ],
-    "CodeGPT.apiKey": "CodeGPT Plus Beta"
+    ]
 }
--- a/.woodpecker/gitea.yml
+++ b/.woodpecker/gitea.yml
@ -1,18 +1,11 @@
 steps:
-  golang:
-    image: golang:1.23
+  release:
+    image: goreleaser/goreleaser
    commands:
-      - go install github.com/goreleaser/goreleaser/v2@v2.7.0
      - goreleaser release -f .goreleaser/gitea.yml --release-notes=".changes/$(go run backy.go version -V).md"
-    environment:
-      GITEA_TOKEN:
-        from_secret: gitea_token
-        
+    secrets: [ gitea_token ]
    when:
      event: tag
-  # release:
-  #   image: goreleaser/goreleaser
-  #   commands:

 when:
  - event: tag
--- a/.woodpecker/go-lint.yml
+++ b/.woodpecker/go-lint.yml
@ -5,7 +5,7 @@ steps:
      - go build
      - go test
  release:
-    image: golangci/golangci-lint:v1.64.7
+    image: golangci/golangci-lint:v1.53.3
    commands:
      - golangci-lint run -v --timeout 5m

--- a/.woodpecker/publish-docs.yml
+++ b/.woodpecker/publish-docs.yml
@ -23,14 +23,7 @@ steps:
      - echo "$SSH_DEPLOY_KEY" | tr -d '\r' | DISPLAY=":0.0" SSH_ASKPASS=~/.ssh/.print_ssh_password setsid ssh-add -
      - rsync -atv --delete --progress public/ backy@backy.cybershell.xyz:docs
      - rsync -atv --delete --progress vangen/ backy@backy.cybershell.xyz:vangen-go
-    environment:
-      SSH_HOST_KEY:
-        from_secret: ssh_host_key
-      SSH_DEPLOY_KEY:
-        from_secret: ssh_deploy_key
-      SSH_PASSPHRASE:
-        from_secret: ssh_passphrase
+    secrets: [ ssh_host_key, ssh_deploy_key, ssh_passphrase ]

 when:
-  - branch: master
-  - path: 'docs/**'
+  - branch: master
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -6,102 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v0.10.2 - 2025-03-19
-### Added
-* Notifications: http service added
-* Variable support. Can be referenced with `%{var:nameOfVar}%` in select string fields.
-### Changed
-* vault: initialize vault before validating config
-
-## v0.10.1 - 2025-03-11
-### Added
-* UserCommands: add ssh public keys when running locally
-* UserCommands: add field CreateUserHome
-### Changed
-* UserCommands: create temp file when modifing password over SSH
-* UserCommands: change field name
-* Vault: keys are now referenced by `name`, and the actual data by `data`
-
-## v0.10.0 - 2025-03-08
-### Added
-* Hooks: improved logging when executing
-* User commands: adding SSH keys using config key `userSshPubKeys`
-* directives: added support for fetching values using directive `%{externalSource:key}%`
-### Changed
-* Commands: if dir is not specified, run in config dir
-* FileDirective: use the config directory if path is not absolute
-* Host: changes to case of some keys
-* Notifications: added external directive to sensitive keys
-### Fixed
-* LocalFetcher: return fetch error
-* Lists: load file key before attempting to load from current file
-* fix: host not in config file, but in ssh config, properly added to hosts struct
-* SSH: password authentication bugs
-* User commands: change user password works
-
-## v0.9.1 - 2025-03-01
-### Changed
-* Use EnvVar AWS_PROFILE to get S3 profile
-
-## v0.9.0 - 2025-02-28
-### Added
-* `list` command with subcommands `cmds` and `lists`
-* Deprecation and unsupported warnings for old config keys
-* CLI flag `--cmdStdOut` to output command's stdout/stderr to stdout
-* Command type `remoteScript`. See docs for more info.
-### Changed
-* change to enums for Command type
-* Cache now stores resources by URL hash for ease-of-lookup
-* Changed PackageOperation to enums
-### Fixed
-* Local command's `dir` full path is now found with home directory
-
-## v0.8.0 - 2025-02-15
-### Changed
-* Breaking: `cmd-lists` key changed to `cmdLists`
-* Properly load list config
-* Config file loading properly errors
-* CI Configs
-
-## v0.7.8 - 2025-02-14
-### Fixed
-* Github CI config
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-
-## v0.7.7 - 2025-02-14
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-* CI configs
-
-## v0.7.6 - 2025-02-14
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-* CI configs
-
-## v0.7.5 - 2025-02-14
-### Changed
-* CI configs
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-
-## v0.7.4 - 2025-02-14
-### Changed
-* CI configs
-### Fixed
-* v0.7.1: Incorrect local config file loading logic caused files to not be detected
-
-## v0.7.3 - 2025-02-14
-### Changed
-* GoReleaser configs
-
-## v0.7.2 - 2025-02-14
-### Fixed
-* CI configs
-
-## v0.7.1 - 2025-02-14
-### Fixed
-* Incorrect local config file loading logic caused files to not be detected
-
 ## v0.7.0 - 2025-02-11
 ### Added
 * [feat]: package `packageOperation` option `checkVersion` implemented
--- a/backy.code-workspace
+++ b/backy.code-workspace
@ -7,20 +7,14 @@
 	],
 	"settings": {
 		"cSpell.words": [
-			"Autorestic",
-			"changie",
 			"Cmds",
-			"CMDSTDOUT",
-			"goreleaser",
+			"remotefetcher",
 			"knadh",
 			"koanf",
 			"mattn",
 			"maunium",
 			"mautrix",
 			"nikoksr",
-			"packagemanagercommon",
-			"rawbytes",
-			"remotefetcher",
 			"Strs"
 		]
 	}
--- a/cmd/backup.go
+++ b/cmd/backup.go
@ -30,14 +30,9 @@ func init() {
 }

 func Backup(cmd *cobra.Command, args []string) {
-	backyConfOpts := backy.NewConfigOptions(configFile,
-		backy.AddCommandLists(cmdLists),
-		backy.SetLogFile(logFile),
-		backy.EnableCommandStdOut(cmdStdOut),
-		backy.SetHostsConfigFile(hostsConfigFile))
-
+	backyConfOpts := backy.NewOpts(cfgFile, backy.AddCommandLists(cmdLists))
 	backyConfOpts.InitConfig()
-	backyConfOpts.ParseConfigurationFile()
+	backyConfOpts.ReadConfig()

 	backyConfOpts.RunListConfig("")
 	for _, host := range backyConfOpts.Hosts {
--- a/cmd/backup_test.go
+++ b/cmd/backup_test.go
@ -1,54 +0,0 @@
-package cmd
-
-// import (
-// 	"bufio"
-// 	"encoding/json"
-// 	"os"
-// 	"os/exec"
-// 	"strings"
-// 	"testing"
-
-// 	"github.com/stretchr/testify/assert"
-// )
-
-// // TestConfigOptions tests the configuration options for the backy package.
-// func Test_ErrorHook(t *testing.T) {
-// 	configFile := "-f ../../tests/ErrorHook.yml"
-// 	logFile := "--log-file=ErrorHook.log"
-// 	backyCommand := exec.Command("go", "run", "../../backy.go", configFile, logFile, "backup")
-// 	backyCommand.Stderr = os.Stdout
-// 	backyCommand.Stdout = os.Stdout
-// 	err := backyCommand.Run()
-// 	assert.Nil(t, err)
-// 	os.Remove("ErrorHook.log")
-// 	logFileData, logFileErr := os.ReadFile("ErrorHook.log")
-// 	if logFileErr != nil {
-// 		assert.FailNow(t, logFileErr.Error())
-
-// 	}
-// 	var JsonData []map[string]interface{}
-// 	jsonScanner := bufio.NewScanner(strings.NewReader(string(logFileData)))
-
-// 	for jsonScanner.Scan() {
-// 		var jsonDataLine map[string]interface{}
-// 		err = json.Unmarshal(jsonScanner.Bytes(), &jsonDataLine)
-// 		assert.Nil(t, err)
-// 		JsonData = append(JsonData, jsonDataLine)
-// 	}
-// 	for _, v := range JsonData {
-// 		_, ok := v["error"]
-// 		if !ok {
-// 			assert.FailNow(t, "error does not exist\n")
-// 			// return
-// 		}
-// 	}
-// 	// t.Logf("%s", logFileData)
-// 	// t.Logf("%v", JsonData)
-// }
-
-// func TestBackupErrorHook(t *testing.T) {
-// 	logFile = "ErrorHook.log"
-
-// 	configFile = "../tests/ErrorHook.yml"
-
-// }
--- a/cmd/config.go
+++ b/cmd/config.go
@ -20,7 +20,7 @@ package cmd

 // func config(cmd *cobra.Command, args []string) {

-// 	opts := backy.NewConfigOptions(configFile, backy.cronEnabled())
+// 	opts := backy.NewOpts(cfgFile, backy.cronEnabled())
 // 	opts.InitConfig()

 // }
--- a/cmd/cron.go
+++ b/cmd/cron.go
@ -18,14 +18,9 @@ var (
 func cron(cmd *cobra.Command, args []string) {
 	parseS3Config()

-	opts := backy.NewConfigOptions(configFile,
-		backy.EnableCron(),
-		backy.SetLogFile(logFile),
-		backy.EnableCommandStdOut(cmdStdOut),
-		backy.SetHostsConfigFile(hostsConfigFile))
-
+	opts := backy.NewOpts(cfgFile, backy.EnableCron())
 	opts.InitConfig()
-	opts.ParseConfigurationFile()
+	opts.ReadConfig()

 	opts.Cron()
 }
--- a/cmd/exec.go
+++ b/cmd/exec.go
@ -32,12 +32,8 @@ func execute(cmd *cobra.Command, args []string) {
 		logging.ExitWithMSG("Please provide a command to run. Pass --help to see options.", 1, nil)
 	}

-	opts := backy.NewConfigOptions(configFile,
-		backy.AddCommands(args),
-		backy.SetLogFile(logFile),
-		backy.EnableCommandStdOut(cmdStdOut),
-		backy.SetHostsConfigFile(hostsConfigFile))
+	opts := backy.NewOpts(cfgFile, backy.AddCommands(args), backy.SetLogFile(logFile))
 	opts.InitConfig()
-	opts.ParseConfigurationFile()
+	opts.ReadConfig()
 	opts.ExecuteCmds()
 }
--- a/cmd/host.go
+++ b/cmd/host.go
@ -35,13 +35,10 @@ func init() {
 //    2. stdin (on command line) (TODO)

 func Host(cmd *cobra.Command, args []string) {
-	backyConfOpts := backy.NewConfigOptions(configFile,
-		backy.SetLogFile(logFile),
-		backy.EnableCommandStdOut(cmdStdOut),
-		backy.SetHostsConfigFile(hostsConfigFile))
+	backyConfOpts := backy.NewOpts(cfgFile, backy.SetLogFile(logFile))
 	backyConfOpts.InitConfig()

-	backyConfOpts.ParseConfigurationFile()
+	backyConfOpts.ReadConfig()

 	// check CLI input
 	if hostsList == nil {
@ -49,20 +46,14 @@ func Host(cmd *cobra.Command, args []string) {
 	}

 	for _, h := range hostsList {
-		if backy.IsHostLocal(h) {
-			continue
-		}
 		// check if h exists in the config file
 		_, hostFound := backyConfOpts.Hosts[h]
 		if !hostFound {
 			// check if h exists in the SSH config file
-			hostFoundInConfig, s := backy.DoesHostHaveHostName(h)
+			hostFoundInConfig, s := backy.CheckIfHostHasHostName(h)
 			if !hostFoundInConfig {
 				logging.ExitWithMSG("host "+h+" not found", 1, &backyConfOpts.Logger)
 			}
-			if backyConfOpts.Hosts == nil {
-				backyConfOpts.Hosts = make(map[string]*backy.Host)
-			}
 			// create host with hostname and host
 			backyConfOpts.Hosts[h] = &backy.Host{Host: h, HostName: s}
 		}
@ -77,5 +68,5 @@ func Host(cmd *cobra.Command, args []string) {
 		}
 	}

-	backyConfOpts.ExecCmdsOnHosts(cmdList, hostsList)
+	backyConfOpts.ExecCmdsSSH(cmdList, hostsList)
 }
--- a/cmd/list.go
+++ b/cmd/list.go
@ -6,29 +6,16 @@ package cmd

 import (
 	"git.andrewnw.xyz/CyberShell/backy/pkg/backy"
-	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"

 	"github.com/spf13/cobra"
 )

 var (
 	listCmd = &cobra.Command{
-		Use:   "list [command]",
-		Short: "List commands, lists, or hosts defined in config file.",
-		Long:  "List commands, lists, or hosts defined in config file",
-	}
-
-	listCmds = &cobra.Command{
-		Use:   "cmds [cmd1 cmd2 cmd3...]",
-		Short: "List commands defined in config file.",
-		Long:  "List commands defined in config file",
-		Run:   ListCommands,
-	}
-	listCmdLists = &cobra.Command{
-		Use:   "lists [list1 list2 ...]",
-		Short: "List lists defined in config file.",
-		Long:  "List lists defined in config file",
-		Run:   ListCommandLists,
+		Use:   "list [--list=list1,list2,... | -l list1, list2,...] [ -cmd cmd1 cmd2 cmd3...]",
+		Short: "Lists commands, lists, or hosts defined in config file.",
+		Long:  "Backup lists commands or groups defined in config file.\nUse the --lists or -l flag to list the specified lists. If not flag is not given, all lists will be executed.",
+		Run:   List,
 	}
 )

@ -36,55 +23,27 @@ var listsToList []string
 var cmdsToList []string

 func init() {
-	listCmd.AddCommand(listCmds, listCmdLists)
+
+	listCmd.Flags().StringSliceVarP(&listsToList, "lists", "l", nil, "Accepts comma-separated names of command lists to list.")
+	listCmd.Flags().StringSliceVarP(&cmdsToList, "cmds", "c", nil, "Accepts comma-separated names of commands to list.")

 }

-func ListCommands(cmd *cobra.Command, args []string) {
+func List(cmd *cobra.Command, args []string) {

 	// setup based on whats passed in:
 	//   - cmds
 	//   - lists
 	//   - if none, list all commands
-	if len(args) > 0 {
-		cmdsToList = args
-	} else {
-		logging.ExitWithMSG("Error: list cmds subcommand needs commands to list", 1, nil)
-	}
+	if cmdLists != nil {

+	}
 	parseS3Config()

-	opts := backy.NewConfigOptions(configFile,
-		backy.SetLogFile(logFile),
-		backy.SetHostsConfigFile(hostsConfigFile))
+	opts := backy.NewOpts(cfgFile)

 	opts.InitConfig()
-	opts.ParseConfigurationFile()
-
-	for _, v := range cmdsToList {
-		opts.ListCommand(v)
-	}
-}
-
-func ListCommandLists(cmd *cobra.Command, args []string) {
-
-	parseS3Config()
-
-	if len(args) > 0 {
-		listsToList = args
-	} else {
-		logging.ExitWithMSG("Error: lists subcommand needs lists", 1, nil)
-	}
-
-	opts := backy.NewConfigOptions(configFile,
-		backy.SetLogFile(logFile),
-		backy.SetHostsConfigFile(hostsConfigFile))
-
-	opts.InitConfig()
-	opts.ParseConfigurationFile()
-
-	for _, v := range listsToList {
-		opts.ListCommandList(v)
-	}
+	opts.ReadConfig()

+	opts.ListCommand("rm-sn-db")
 }
--- a/cmd/root.go
+++ b/cmd/root.go
@ -13,12 +13,10 @@ import (

 var (
 	// Used for flags.
-	configFile      string
-	hostsConfigFile string
-	verbose         bool
-	cmdStdOut       bool
-	logFile         string
-	s3Endpoint      string
+	cfgFile    string
+	verbose    bool
+	logFile    string
+	s3Endpoint string

 	rootCmd = &cobra.Command{
 		Use:   "backy",
@ -37,10 +35,8 @@ func Execute() {

 func init() {
 	rootCmd.PersistentFlags().StringVar(&logFile, "log-file", "", "log file to write to")
-	rootCmd.PersistentFlags().BoolVar(&cmdStdOut, "cmdStdOut", false, "Pass to print command output to stdout")

-	rootCmd.PersistentFlags().StringVarP(&configFile, "config", "f", "", "config file to read from")
-	rootCmd.PersistentFlags().StringVar(&hostsConfigFile, "hostsConfig", "", "yaml hosts file to read from")
+	rootCmd.PersistentFlags().StringVarP(&cfgFile, "config", "f", "", "config file to read from")
 	rootCmd.PersistentFlags().BoolVarP(&verbose, "verbose", "v", false, "Sets verbose level")
 	rootCmd.PersistentFlags().StringVar(&s3Endpoint, "s3-endpoint", "", "Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.")
 	rootCmd.AddCommand(backupCmd, execCmd, cronCmd, versionCmd, listCmd)
--- a/cmd/version.go
+++ b/cmd/version.go
@ -7,7 +7,7 @@ import (
 	"github.com/spf13/cobra"
 )

-const versionStr = "0.10.2"
+const versionStr = "0.7.0"

 var (
 	versionCmd = &cobra.Command{
--- a/docs/content/cli/_index.md
+++ b/docs/content/cli/_index.md
@ -14,21 +14,18 @@ Usage:
  backy [command]

 Available Commands:
-  backup      Runs commands defined in config file. Use -l flag multiple times to run multiple lists.
+  backup      Runs commands defined in config file.
  completion  Generate the autocompletion script for the specified shell
  cron        Starts a scheduler that runs lists defined in config file.
  exec        Runs commands defined in config file in order given.
  help        Help about any command
-  list        List commands, lists, or hosts defined in config file.
+  list        Lists commands, lists, or hosts defined in config file.
  version     Prints the version and exits

 Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-  -h, --help                 help for backy
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -h, --help            help for backy
+  -v, --verbose         Sets verbose level

 Use "backy [command] --help" for more information about a command.
 ```
@ -42,18 +39,15 @@ Backup executes commands defined in config file.
 Use the --lists or -l flag to execute the specified lists. If not flag is not given, all lists will be executed.

 Usage:
-  backy backup [--lists=list1 --lists list2 ... | -l list1 -l list2 ...] [flags]
+  backy backup [--lists=list1,list2,... | -l list1, list2,...] [flags]

 Flags:
-  -h, --help                help for backup
-  -l, --lists stringArray   Accepts comma-separated names of command lists to execute.
+  -h, --help            help for backup
+  -l, --lists strings   Accepts comma-separated names of command lists to execute.

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
 ```

 ## cron
@ -68,11 +62,8 @@ Flags:
  -h, --help   help for cron

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
 ```

 ## exec
@ -91,11 +82,8 @@ Flags:
  -h, --help   help for exec

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level

 Use "backy exec [command] --help" for more information about a command.
 ```
@ -107,19 +95,16 @@ Host executes specified commands on the hosts defined in config file.
 Use the --commands or -c flag to choose the commands.

 Usage:
-  backy exec host [--command=command1 --command=command2 ... | -c command1 -c command2 ...] [--hosts=host1 --hosts=hosts2 ... | -m host1 -m host2 ...]  [flags]
+  backy exec host [--commands=command1,command2, ... | -c command1,command2, ...] [--hosts=host1,hosts2, ... | -m host1,host2, ...]  [flags]

 Flags:
-  -c, --command stringArray   Accepts space-separated names of commands. Specify multiple times for multiple commands.
-  -h, --help                  help for host
-  -m, --hosts stringArray     Accepts space-separated names of hosts. Specify multiple times for multiple hosts.
+  -c, --commands strings   Accepts comma-separated names of commands.
+  -h, --help               help for host
+  -m, --hosts strings      Accepts comma-separated names of hosts.

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
 ```

 ## version
@ -136,70 +121,25 @@ Flags:
  -V, --vpre   Output the version with v prefixed.

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
 ```

 ## list

 ```
-List commands, lists, or hosts defined in config file
+Backup lists commands or groups defined in config file.
+Use the --lists or -l flag to list the specified lists. If not flag is not given, all lists will be executed.

 Usage:
-  backy list [command]
-
-Available Commands:
-  cmds        List commands defined in config file.
-  lists       List lists defined in config file.
+  backy list [--list=list1,list2,... | -l list1, list2,...] [ -cmd cmd1 cmd2 cmd3...] [flags]

 Flags:
-  -h, --help   help for list
+  -c, --cmds strings    Accepts comma-separated names of commands to list.
+  -h, --help            help for list
+  -l, --lists strings   Accepts comma-separated names of command lists to list.

 Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
-
-Use "backy list [command] --help" for more information about a command.
-```
-## list cmds
-
-```
-List commands defined in config file
-
-Usage:
-  backy list cmds [cmd1 cmd2 cmd3...] [flags]
-
-Flags:
-  -h, --help   help for cmds
-
-Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
-```
-## list lists
-
-```
-List lists defined in config file
-
-Usage:
-  backy list lists [list1 list2 ...] [flags]
-
-Flags:
-  -h, --help   help for lists
-
-Global Flags:
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
+  -f, --config string   config file to read from
+  -v, --verbose         Sets verbose level
 ```
--- a/docs/content/cli/exec.md
+++ b/docs/content/cli/exec.md
@ -7,13 +7,13 @@ The `exec` subcommand can do some things that the configuration file can't do ye
 `exec host` takes the following arguments:

 ```sh
-  -c, --commands strings   Accepts space-separated names of commands.
+  -c, --commands strings   Accepts comma-separated names of commands.
  -h, --help               help for host
-  -m, --hosts strings      Accepts space-separated names of hosts.
+  -m, --hosts strings      Accepts comma-separated names of hosts.
 ```

 The commands have to be defined in the config file. The hosts need to at least be in the ssh_config(5) file.

 ```sh
-backy exec host [--commands=command1 -commands=command2 ... | -c command1 -c command2 ...] [--hosts=host1 --hosts=hosts2 ... | -m host1 -m host2 ...]  [flags]
+backy exec host [--commands=command1,command2, ... | -c command1,command2, ...] [--hosts=host1,hosts2, ... | -m host1,host2, ...]  [flags]
 ```
--- a/docs/content/cli/list.md
+++ b/docs/content/cli/list.md
@ -1,29 +0,0 @@
---
-title: List
---
-
-
-List commands, lists, or hosts defined in config file
-
-Usage:
-```
-  backy list [command]
-```
-
-Available Commands:
-  cmds        List commands defined in config file.
-  lists       List lists defined in config file.
-
-Flags:
-```
-  -h, --help   help for list
-```
-
-Global Flags:
-```
-      --cmdStdOut            Pass to print command output to stdout
-  -f, --config string        config file to read from
-      --log-file string      log file to write to
-      --s3-endpoint string   Sets the S3 endpoint used for config file fetching. Overrides S3_ENDPOINT env variable.
-  -v, --verbose              Sets verbose level
-```
--- a/docs/content/config/command-lists.md
+++ b/docs/content/config/command-lists.md
@ -2,7 +2,7 @@
 title: "Command Lists"
 weight: 2
 description: >
-  This page tells you how to use command lists.
+  This page tells you how to get use command lists.
 ---

 Command lists are for executing commands in sequence and getting notifications from them.
@ -11,8 +11,8 @@ The top-level object key can be anything you want but not the same as another.

 Lists can go in a separate file. Command lists should be in a separate file if:

-1. key 'cmdLists.file' is specified
-2. lists.yml or lists.yaml is found in the same directory as the backy config file (this includes remote config files as of v0.7.0)
+1. key 'cmd-lists.file' is specified
+2. lists.yml or lists.yaml is found in the same directory as the backy config file

 {{% notice info %}}
 The lists file is also checked in remote resources. 
@ -35,12 +35,12 @@ If a remote config file is specified (on the command-line using `-f`) and the li
 ```

 | key | description | type | required
-| --- | --- | --- | ---
-| `order` | Defines the sequence of commands to execute | `[]string` | yes
-| `sendNotificationOnSuccess` | Whether to send notification on list success with the commands' output | `bool` | no
-| `notifications` | The notification service(s) and ID(s) to use on success and failure. Must be *`service.id`*. See the [notifications documentation page](/config/notifications/) for more | `[]string` | no
-| `name` | Optional name of the list | `string` | no
-| `cron` | Time at which to schedule the list. Only has affect when cron subcommand is run. | `string` | no
+| --- | --- | --- | --- |
+| `order` | Defines the sequence of commands to execute | `[]string` | yes |
+| `getOutput` | Command(s) output is in the notification(s) | `bool` | no |
+| `notifications` | The notification service(s) and ID(s) to use on success and failure. Must be *`service.id`*. See the [notifications documentation page](/config/notifications/) for more | `[]string` | no |
+| `name` | Optional name of the list | `string` | no |
+| `cron` | Time at which to schedule the list. Only has affect when cron subcommand is run. | `string` | no |

 ### Order

@ -70,14 +70,14 @@ Name is optional. If name is not defined, name will be the object's map key.

 Backy also has a cron mode, so one can run `backy cron` and start a process that schedules jobs to run at times defined in the configuration file.

-Adding `cron: 0 0 1 * * *` to a `cmdLists` object will schedule the list at 1 in the morning. See [https://crontab.guru/](https://crontab.guru/) for reference.
+Adding `cron: 0 0 1 * * *` to a `cmd-lists` object will schedule the list at 1 in the morning. See [https://crontab.guru/](https://crontab.guru/) for reference.

 {{% notice tip %}}
 Note: Backy uses the second field of cron, so add anything except `*` to the beginning of a regular cron expression.
 {{% /notice %}}

 ```yaml {lineNos="true" wrap="true" title="yaml"}
-cmdLists:
+cmd-lists:
   docker-container-backup: # this can be any name you want
     # all commands have to be defined
     order:
--- a/docs/content/config/commands/_index.md
+++ b/docs/content/config/commands/_index.md
@ -8,21 +8,46 @@ weight: 1

 ### Example Config

-{{% code file="/examples/example.yml" language="yaml" %}}
+```yaml
+commands:
+  stop-docker-container:
+    cmd: docker
+    Args:
+      - compose
+      - -f /some/path/to/docker-compose.yaml
+      - down
+    # if host is not defined, command will be run locally
+    # The host has to be defined in either the config file or the SSH Config files
+    host: some-host
+    hooks
+      error:
+        - some-other-command-when-failing
+      success:
+        - success-command
+      final:
+        - final-command
+  backup-docker-container-script:
+    cmd: /path/to/local/script
+    # script file is input as stdin to SSH
+    type: scriptFile # also can be script
+    environment:
+      - FOO=BAR
+      - APP=$VAR
+```

 Values available for this section **(case-sensitive)**:

-| name            | notes                                                                                                   | type                  | required | External directive support |
-| ----------------| ------------------------------------------------------------------------------------------------------- | --------------------- | -------- |----------------------------|
-| `cmd`           | Defines the command to execute                                                                          | `string`              | yes      | No                         |
-| `Args`          | Defines the arguments to the command                                                                    | `[]string`            | no       | No                         |
-| `environment`   | Defines environment variables for the command                                                           | `[]string`            | no       | Partial                    |
-| `type`          | See documentation further down the page. Additional fields may be required.                             | `string`              | no       | No                         |
-| `getOutput`     | Command(s) output is in the notification(s)                                                             | `bool`                | no       | No                         |
-| `host`          | If not specified, the command will execute locally.                                                     | `string`              | no       | No                         |
-| `scriptEnvFile` | When type is `scriptFile` or `script`, this file is prepended to the input.                             | `string`              | no       | No                         |
-| `shell`         | Run the command in the shell                                                                            | `string`              | no       | No                         |
-| `hooks`         | Hooks are used at the end of the individual command. Must have at least `error`, `success`, or `final`. | `map[string][]string` | no       | No                         |
+| name | notes | type | required
+| --- | --- | --- | --- |
+| `cmd` | Defines the command to execute | `string` | yes |
+| `Args` | Defines the arguments to the command | `[]string` | no |
+| `environment` | Defines environment variables for the command | `[]string` | no |
+| `type` | See documentation further down the page. Additional fields may be required. | `string` | no |
+| `getOutput` | Command(s) output is in the notification(s) | `bool` | no |
+| `host` | If not specified, the command will execute locally. | `string` | no |
+| `scriptEnvFile` | When type is `scriptFile` or `script`, this file is prepended to the input. | `string` | no |
+| `shell` | Run the command in the shell | `string` | no |
+| `hooks` | Hooks are used at the end of the individual command. Must have at least `error`, `success`, or `final`. | `map[string][]string` | no |

 #### cmd

@ -95,9 +120,8 @@ The following options are available:
 The environment variables support expansion:

 - using escaped values `$VAR` or `${VAR}`
- using any external directive, and if using the env directive, the variable will be read from a `.env` file

-<!-- For now, the variables expanded have to be defined in an `.env` file in the same directory that the program is run from. -->
+For now, the variables have to be defined in an `.env` file in the same directory that the program is run from.

 If using it with host specified, the SSH server has to be configured to accept those env variables.

--- a/docs/content/config/commands/user-commands.md
+++ b/docs/content/config/commands/user-commands.md
@ -6,18 +6,14 @@ description: This is dedicated to user commands.

 This is dedicated to `user` commands. The command `type` field must be `user`. User is a type that allows one to perform user operations. There are several additional options available when `type` is `user`:

-| name            | notes                                                        | type       | required | External directive support
-| ----------------| -------------------------------------------------------------| ---------- | ---------| --------------------------|
-| `userName`      | The name of a user to be configured.                         | `string`   | yes      | no 						 |
-| `userOperation` | The type of operation to perform.                            | `string`   | yes      | no 						 |
-| `userID`        | The user ID to use.                                          | `string`   | no       | no 						 |
-| `userGroups`    | The groups the user should be added to.                      | `[]string` | no       | no 						 |
-| `systemUser`    | Create a system user.                                        | `bool`     | no       | no 						 |
-| `userCreateHome`| Create the home directory.                                   | `bool`     | no       | no 						 |
-| `userSshPubKeys`| The keys to add to the user's authorized keys.               | `[]string` | no       | yes 						 |
-| `userShell`     | The shell for the user.                                      | `string`   | no       | no 						 |
-| `userHome`      | The user's home directory.                                   | `string`   | no       | no 						 |
-| `userPassword`  | The new password value when using the `password` operation.  | `string`   | no       | yes						 |
+| name | notes | type | required |
+| --- | --- | --- | --- |
+| `userName` | The name of a user to be configured. | `string` | yes |
+| `userOperation` | The type of operation to perform. | `string` | yes |
+| `userID` | The user ID to use. | `string` | yes |
+| `userGroups` | The groups the user should be added to. | `[]string` | yes |
+| `userShell` | The shell for the user. | `string` | yes |
+| `userHome` | The user's home directory. | `string` | no |


 #### example
--- a/docs/content/config/directives.md
+++ b/docs/content/config/directives.md
@ -1,15 +0,0 @@
---
-title: "External Directives"
-weight: 2
-description: How to set up external directives.
---
-
-External directives are for including data that should not be in the config file. The following directives are supported:
-
- `%{file:path/to/file}%`
- `%{env:ENV_VAR}%`
- `%{vault:vault-key}%`
-
-See the docs of each command if the field is supported.
-
-If the file path does not begin with a `/`, the config file's directory will be used as the starting point.
--- a/docs/content/config/hosts.md
+++ b/docs/content/config/hosts.md
@ -5,20 +5,20 @@ description: >
  This page tells you how to use hosts.
 ---

-| Key                  | Description                                                   | Type     | Required | External directive support |
-|----------------------|---------------------------------------------------------------|----------|----------|----------------------------|
-| `OS`                 | Operating system of the host (used for package commands)      | `string` | no       | No                         |
-| `config`             | Path to the SSH config file                                   | `string` | no       | No                         |
-| `host`               | Specifies the `Host` ssh_config(5) directive                  | `string` | yes      | No                         |
-| `hostname`           | Hostname of the host                                          | `string` | no       | No                         |
-| `knownHostsFile`     | Path to the known hosts file                                  | `string` | no       | No                         |
-| `port`               | Port number to connect to                                     | `uint16` | no       | No                         |
-| `proxyjump`          | Proxy jump hosts, comma-separated                             | `string` | no       | No                         |
-| `password`           | Password for SSH authentication                               | `string` | no       | No                         |
-| `privateKeyPath`     | Path to the private key file                                  | `string` | no       | No                         |
-| `privateKeyPassword` | Password for the private key file                             | `string` | no       | Yes                        |
-| `user`               | Username for SSH authentication                               | `string` | no       | No                         |
+| Key                  | Description                                                   | Type     | Required |
+|----------------------|---------------------------------------------------------------|----------|----------|
+| `OS`                 | Operating system of the host (used for package commands)      | `string` | no       |
+| `config`             | Path to the SSH config file                                   | `string` | no       |
+| `host`               | Specifies the `Host` ssh_config(5) directive                  | `string` | yes      |
+| `hostname`           | Hostname of the host                                          | `string` | no       |
+| `knownhostsfile`     | Path to the known hosts file                                  | `string` | no       |
+| `port`               | Port number to connect to                                     | `uint16` | no       |
+| `proxyjump`          | Proxy jump hosts, comma-separated                             | `string` | no       |
+| `password`           | Password for SSH authentication                               | `string` | no       |
+| `privatekeypath`     | Path to the private key file                                  | `string` | no       |
+| `privatekeypassword` | Password for the private key file                             | `string` | no       |
+| `user`               | Username for SSH authentication                               | `string` | no       |

 ## exec host subcommand

-Backy has a subcommand `exec host`. This subcommand takes the flags of `-m host1 -m host2`. For now these hosts need to be defined in the config file.
+Backy has a subcommand `exec host`. This subcommand takes the flags of `-m host1 -m host2`. For now these hosts need to be defined in the config file.
--- a/docs/content/config/notifications.md
+++ b/docs/content/config/notifications.md
@ -39,23 +39,23 @@ There must be a section with an id (eg. `mail.test-svr`) following one of these

 ### mail

-| key | description | type | External directive support |
-| --- | --- | --- | --- |
-| `host` | Specifies the SMTP host to connect to | `string` | no
-| `port` | Specifies the SMTP port | `uint16` | no
-| `senderaddress` | Address from which to send mail | `string` | no
-| `to` | Recipients to send emails to | `[]string` | no
-| `username` | SMTP username | `string` | no
-| `password` | SMTP password | `string` | yes
+| key | description | type
+| --- | --- | ---
+| `host` | Specifies the SMTP host to connect to | `string`
+| `port` | Specifies the SMTP port | `uint16`
+| `senderaddress` | Address from which to send mail | `string`
+| `to` | Recipients to send emails to | `[]string`
+| `username` | SMTP username | `string`
+| `password` | SMTP password | `string`

 ### matrix

-| key | description | type | External directive support |
-| --- | --- | ---| ---- |
-| `home-server` | Specifies the Matrix server connect to | `string` | no
-| `room-id` | Specifies the room ID of the room to send messages to | `string` | no
-| `access-token` | Matrix access token  | `string` | yes
-| `user-id` | Matrix user ID | `string` | no
+| key | description | type
+| --- | --- | ---
+| `home-server` | Specifies the Matrix server connect to | `string`
+| `room-id` | Specifies the room ID of the room to send messages to | `string`
+| `access-token` | Matrix access token | `string`
+| `user-id` | Matrix user ID | `string`

 To get your access token (assumes you are using [Element](https://element.io/)) :

--- a/docs/content/config/remote-resources.md
+++ b/docs/content/config/remote-resources.md
@ -12,10 +12,6 @@ For the main config file to be fetched remotely, pass the URL using `-f [url]`.

 If using S3, you should use the s3 protocol URI: `s3://bucketName/key/path`. You will also need to set the env variable `S3_ENDPOINT` to the appropriate value. The flag `--s3-endpoint` can be used to override this value or to set this value, if not already set.

-## Authentication
-
-Currently, only the AWS authentication credentials file `~/.aws/credentials` is supported. For now, the environment variable `AWS_PROFILE` is used to lookup the profile.
-
 ## Scripts

-Remote script support is currently limited to http/https endpoints.
+Scripts will be coming later.
--- a/docs/content/config/vault.md
+++ b/docs/content/config/vault.md
@ -6,7 +6,7 @@ description: Set up and configure vault.

 [Vault](https://www.vaultproject.io/) is a tool for storing secrets and other data securely.

-A Vault key can be used by prefixing `%{vault:vault.keys.name}%` in a field that supports external directives.
+Vault config can be used by prefixing `vault:` in front of a password or ENV var.

 This is the object in the config file:

@ -18,12 +18,10 @@ vault:
  keys:
    - name: mongourl
      mountpath: secret
-      key: data
      path: mongo/url
-      type: KVv2  # KVv1 or KVv2
-    - name: someKeyName
-      mountpath: secret
-      key: keyData
-      type: KVv2
-      path: some/path
+      type:  # KVv1 or KVv2
+    - name:
+      path:
+      type:
+      mountpath:
 ```
--- a/docs/content/examples/backy.yaml
+++ b/docs/content/examples/backy.yaml
@ -1,108 +0,0 @@
-commands:
-  stop-docker-container:
-    cmd: docker
-    Args:
-      - compose
-      - -f /some/path/to/docker-compose.yaml
-      - down
-    # if host is not defined, cmd will be run locally
-    host: some-host
-    hooks:
-      final:
-        - hostname
-      error:
-        - hostname
-  backup-docker-container-script:
-    cmd: /path/to/script
-    # The host has to be defined in the config file
-    host: some-host
-    environment:
-      - FOO=BAR
-      - APP=$VAR
-  shell-cmd:
-    cmd: rsync
-    shell: bash
-    Args:
-      - -av some-host:/path/to/data ~/Docker/Backups/docker-data
-  hostname:
-    cmd: hostname
-  update-docker:
-    type: package
-    shell: zsh # best to run package commands in a shell
-    packageName: docker-ce
-    Args:
-      - docker-ce-cli
-    packageManager: apt
-    packageOperation: install
-  update-dockerApt:
-    # type: package
-    shell: zsh
-    cmd: apt
-    Args:
-      - update
-      - "&&"
-      - apt install -y docker-ce
-      - docker-ce-cli
-    packageManager: apt
-    packageOperation: install
-
-cmd-lists:
-  cmds-to-run: # this can be any name you want
-    # all commands have to be defined
-    order:
-      - stop-docker-container
-      - backup-docker-container-script
-      - shell-cmd
-      - hostname
-    notifications:
-      - matrix.matrix
-    name: backup-some-server
-    cron: "0 0 1 * * *"
-  hostname:
-    name: hostname
-    order:
-      - hostname
-    notifications:
-      - mail.prod-email
-
-hosts:
-  # any ssh_config(5) keys/values not listed here will be looked up in the config file or the default config file
-  some-host:
-    hostname: some-hostname
-    config: ~/.ssh/config
-    user: user
-    privateKeyPath: /path/to/private/key
-    port: 22
-    # can also be env:VAR
-    password: file:/path/to/file
-    # only one is supported for now
-    proxyjump: some-proxy-host
-
-# optional
-logging:
-  verbose: true
-  file: ./backy.log
-  console: false
-  cmd-std-out: false
-
-
-notifications:
-  mail:
-    prod-email:
-      id: prod-email
-      type: mail
-      host: yourhost.tld
-      port: 587
-      senderAddress: email@domain.tld
-      to:
-        - admin@domain.tld
-      username: smtp-username@domain.tld
-      password: your-password-here
-  matrix:
-    matrix:
-      id: matrix
-      type: matrix
-      home-server: your-home-server.tld
-      room-id: room-id
-      access-token: your-access-token
-      user-id: your-user-id
--- a/docs/content/examples/example.yml
+++ b/docs/content/examples/example.yml
@ -1,24 +0,0 @@
-commands:
-  stop-docker-container:
-    cmd: docker
-    Args:
-      - compose
-      - -f /some/path/to/docker-compose.yaml
-      - down
-    # if host is not defined, command will be run locally
-    # The host has to be defined in either the config file or the SSH Config files
-    host: some-host
-    hooks:
-      error:
-        - some-other-command-when-failing
-      success:
-        - success-command
-      final:
-        - final-command
-  backup-docker-container-script:
-    cmd: /path/to/local/script
-    # script file is input as stdin to SSH
-    type: scriptFile # also can be script
-    environment:
-      - FOO=BAR
-      - APP=$VAR
--- a/docs/content/getting-started/config.md
+++ b/docs/content/getting-started/config.md
@ -48,7 +48,7 @@ commands:
 To execute groups of commands in sequence, use a list configuration.

 ```yaml
-cmdLists:
+cmd-lists:
  cmds-to-run: # this can be any name you want
    # all commands have to be defined in the commands section
    order:
@ -97,7 +97,7 @@ hosts:

 The notifications object can have two forms.

-For more, [see the notification object documentation](/config/notifications). The top-level map key is id that has to be referenced by the `cmdLists` key `notifications`.
+For more, [see the notification object documentation](/config/notifications). The top-level map key is id that has to be referenced by the `cmd-lists` key `notifications`.

 ```yaml
 notifications:
@ -130,7 +130,7 @@ If logfile is not defined, the log file will be written to the config directory

 `console-disabled` controls whether the logging messages are echoed to StdOut. Default is false.

-`verbose` prints out debugging messages.
+`verbose` basically does nothing as all necessary info is already output.

 ```yaml
 logging:
@ -144,7 +144,7 @@ logging:

 [Vault](https://www.vaultproject.io/) can be used to get some configuration values and ENV variables securely.

-```yaml
+```
 vault:
  token: hvs.tXqcASvTP8wg92f7riyvGyuf
  address: http://127.0.0.1:8200
--- a/docs/layouts/shortcodes/code.html
+++ b/docs/layouts/shortcodes/code.html
@ -1,3 +0,0 @@
-{{ $file := .Get "file" | readFile }}
-{{ $lang := .Get "language" }}
-{{ (print "```" $lang "\n" $file "\n```") }}
--- a/examples/example.yml
+++ b/examples/example.yml
@ -1,24 +0,0 @@
-commands:
-  stop-docker-container:
-    cmd: docker
-    Args:
-      - compose
-      - -f /some/path/to/docker-compose.yaml
-      - down
-    # if host is not defined, command will be run locally
-    # The host has to be defined in either the config file or the SSH Config files
-    host: some-host
-    hooks:
-      error:
-        - some-other-command-when-failing
-      success:
-        - success-command
-      final:
-        - final-command
-  backup-docker-container-script:
-    cmd: /path/to/local/script
-    # script file is input as stdin to SSH
-    type: scriptFile # also can be script
-    environment:
-      - FOO=BAR
-      - APP=$VAR
--- a/110
+++ b/110
@ -1,83 +1,67 @@
 #!/bin/bash
 CLI_PAGE="docs/content/cli/_index.md"
-
-BACKYCOMMAND="go run backy.go"
-
-{
 echo "---
-title: CLI
+title: "CLI"
 weight: 4
 ---

 This page lists documentation for the CLI.
-" 
+" > _index.md

-echo "## Backy "
-echo " "
-echo "\`\`\`"
-eval "${BACKYCOMMAND} -h"
-echo "\`\`\`"
-echo " "
+BACKYCOMMAND="go run backy.go"
+
+echo "## Backy " >> _index.md
+echo " " >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo " " >> _index.md


+echo "# Subcommands" >> _index.md
+echo "" >> _index.md

-echo "# Subcommands" 
-echo "" 
+echo "## backup" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} backup -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md

-echo "## backup" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} backup -h"
-echo "\`\`\`" 
-echo "" 
+echo "## cron" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} cron -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md

-echo "## cron" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} cron -h"
-echo "\`\`\`" 
-echo "" 
+echo "## exec" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} exec -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md

-echo "## exec" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} exec -h"
-echo "\`\`\`" 
-echo "" 
-
-echo "### exec host" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} exec host -h"
-echo "\`\`\`" 
-echo "" 
+echo "### exec host" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} exec host -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md


-echo "## version" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} version -h"
-echo "\`\`\`" 
-echo "" 
+echo "## version" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} version -h >>  _index.md"
+echo "\`\`\`" >> _index.md
+echo "" >> _index.md

-echo "## list" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} list -h"
-echo "\`\`\`" 
-
-echo "## list cmds" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} list cmds -h"
-echo "\`\`\`" 
-
-echo "## list lists" 
-echo "" 
-echo "\`\`\`" 
-eval "${BACKYCOMMAND} list lists -h"
-echo "\`\`\`" 
-} >> _index.md
+echo "## list" >> _index.md
+echo "" >> _index.md
+echo "\`\`\`" >> _index.md
+eval "${BACKYCOMMAND} list -h >>  _index.md"
+echo "\`\`\`" >> _index.md


 mv _index.md "$CLI_PAGE"
--- a/go.mod
+++ b/go.mod
@ -1,14 +1,14 @@
 module git.andrewnw.xyz/CyberShell/backy

-go 1.23.0
+go 1.23

-toolchain go1.23.7
+toolchain go1.23.1
+
+replace git.andrewnw.xyz/CyberShell/backy => /home/andrew/Projects/backy

 require (
 	github.com/aws/aws-sdk-go-v2/service/s3 v1.76.0
-	github.com/dmarkham/enumer v1.5.11
 	github.com/go-co-op/gocron v1.37.0
-	github.com/google/uuid v1.6.0
 	github.com/hashicorp/vault/api v1.15.0
 	github.com/joho/godotenv v1.5.1
 	github.com/kevinburke/ssh_config v1.2.0
@ -20,13 +20,10 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/nikoksr/notify v1.3.0
 	github.com/pkg/errors v0.9.1
-	github.com/pkg/sftp v1.13.7
 	github.com/rs/zerolog v1.33.0
 	github.com/sethvargo/go-password v0.3.1
 	github.com/spf13/cobra v1.8.1
-	github.com/stretchr/testify v1.10.0
-	github.com/testcontainers/testcontainers-go v0.37.0
-	golang.org/x/crypto v0.38.0
+	golang.org/x/crypto v0.33.0
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mautrix v0.23.0
@ -34,10 +31,7 @@ require (
 )

 require (
-	dario.cat/mergo v1.0.1 // indirect
 	filippo.io/edwards25519 v1.1.0 // indirect
-	github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
-	github.com/Microsoft/go-winio v0.6.2 // indirect
 	github.com/aws/aws-sdk-go-v2 v1.36.1 // indirect
 	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 // indirect
 	github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 // indirect
@ -48,26 +42,16 @@ require (
 	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 // indirect
 	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 // indirect
 	github.com/aws/smithy-go v1.22.2 // indirect
+	github.com/cenkalti/backoff/v3 v3.2.2 // indirect
 	github.com/cenkalti/backoff/v4 v4.3.0 // indirect
-	github.com/containerd/log v0.1.0 // indirect
-	github.com/containerd/platforms v0.2.1 // indirect
-	github.com/cpuguy83/dockercfg v0.3.2 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/distribution/reference v0.6.0 // indirect
-	github.com/docker/docker v28.0.1+incompatible // indirect
-	github.com/docker/go-connections v0.5.0 // indirect
-	github.com/docker/go-units v0.5.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
-	github.com/ebitengine/purego v0.8.2 // indirect
-	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-ini/ini v1.67.0 // indirect
+	github.com/go-jose/go-jose/v3 v3.0.3 // indirect
 	github.com/go-jose/go-jose/v4 v4.0.1 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
-	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
 	github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
-	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
@ -82,57 +66,30 @@ require (
 	github.com/klauspost/compress v1.17.11 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.9 // indirect
 	github.com/knadh/koanf/maps v0.1.1 // indirect
-	github.com/kr/fs v0.1.0 // indirect
-	github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
-	github.com/magiconair/properties v1.8.10 // indirect
 	github.com/mattn/go-colorable v0.1.14 // indirect
 	github.com/minio/md5-simd v1.1.2 // indirect
 	github.com/mitchellh/copystructure v1.2.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/mitchellh/reflectwalk v1.0.2 // indirect
-	github.com/moby/docker-image-spec v1.3.1 // indirect
-	github.com/moby/patternmatcher v0.6.0 // indirect
-	github.com/moby/sys/sequential v0.5.0 // indirect
-	github.com/moby/sys/user v0.1.0 // indirect
-	github.com/moby/sys/userns v0.1.0 // indirect
-	github.com/moby/term v0.5.0 // indirect
-	github.com/morikuni/aec v1.0.0 // indirect
-	github.com/opencontainers/go-digest v1.0.0 // indirect
-	github.com/opencontainers/image-spec v1.1.1 // indirect
-	github.com/pascaldekloe/name v1.0.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/robfig/cron/v3 v3.0.1 // indirect
+	github.com/rogpeppe/go-internal v1.13.1 // indirect
 	github.com/rs/xid v1.6.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
-	github.com/shirou/gopsutil/v4 v4.25.1 // indirect
-	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stretchr/objx v0.5.2 // indirect
+	github.com/stretchr/testify v1.10.0 // indirect
 	github.com/tidwall/gjson v1.18.0 // indirect
 	github.com/tidwall/match v1.1.1 // indirect
 	github.com/tidwall/pretty v1.2.1 // indirect
 	github.com/tidwall/sjson v1.2.5 // indirect
-	github.com/tklauser/go-sysconf v0.3.12 // indirect
-	github.com/tklauser/numcpus v0.6.1 // indirect
-	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.mau.fi/util v0.8.4 // indirect
-	go.opentelemetry.io/auto/sdk v1.1.0 // indirect
-	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 // indirect
-	go.opentelemetry.io/otel v1.36.0 // indirect
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 // indirect
-	go.opentelemetry.io/otel/metric v1.36.0 // indirect
-	go.opentelemetry.io/otel/sdk v1.36.0 // indirect
-	go.opentelemetry.io/otel/trace v1.36.0 // indirect
-	go.opentelemetry.io/proto/otlp v1.7.0 // indirect
 	go.uber.org/atomic v1.11.0 // indirect
 	golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 // indirect
-	golang.org/x/mod v0.23.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
-	golang.org/x/sync v0.14.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
+	golang.org/x/sync v0.11.0 // indirect
+	golang.org/x/sys v0.30.0 // indirect
+	golang.org/x/text v0.22.0 // indirect
 	golang.org/x/time v0.10.0 // indirect
-	golang.org/x/tools v0.30.0 // indirect
-	google.golang.org/protobuf v1.36.6 // indirect
+	maunium.net/go/maulogger/v2 v2.4.1 // indirect
 )
--- a/go.sum
+++ b/go.sum
@ -1,122 +1,132 @@
-dario.cat/mergo v1.0.1 h1:Ra4+bf83h2ztPIQYNP99R6m+Y7KfnARDfID+a+vLl4s=
-dario.cat/mergo v1.0.1/go.mod h1:uNxQE+84aUszobStD9th8a29P2fMDhsBdgRYvZOxGmk=
 filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
 filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 h1:bvDV9vkmnHYOMsOr4WLk+Vo07yKIzd94sVoIqshQ4bU=
-github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24/go.mod h1:8o94RPi1/7XTJvwPpRSzSUedZrtlirdB3r9Z20bi2f8=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
-github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
-github.com/Microsoft/go-winio v0.6.2 h1:F2VQgta7ecxGYO8k3ZZz3RS8fVIXVxONVUPlNERoyfY=
-github.com/Microsoft/go-winio v0.6.2/go.mod h1:yd8OoFMLzJbo9gZq8j5qaps8bJ9aShtEA8Ipt1oGCvU=
+github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
+github.com/aws/aws-sdk-go-v2 v1.32.7 h1:ky5o35oENWi0JYWUZkB7WYvVPP+bcRF5/Iq7JWSb5Rw=
+github.com/aws/aws-sdk-go-v2 v1.32.7/go.mod h1:P5WJBrYqqbWVaOxgH0X/FYYD47/nooaPOZPlQdmiN2U=
 github.com/aws/aws-sdk-go-v2 v1.36.1 h1:iTDl5U6oAhkNPba0e1t1hrwAo02ZMqbrGq4k5JBWM5E=
 github.com/aws/aws-sdk-go-v2 v1.36.1/go.mod h1:5PMILGVKiW32oDzjj6RU52yrNrDPUHcbZQYr1sM7qmM=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7 h1:lL7IfaFzngfx0ZwUGOZdsFFnQ5uLvR0hWqqhyE7Q9M8=
+github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.7/go.mod h1:QraP0UcVlQJsmHfioCrveWOC1nbiWUl3ej08h4mXWoc=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8 h1:zAxi9p3wsZMIaVCdoiQp2uZ9k1LsZvmAnoTBeZPXom0=
 github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.6.8/go.mod h1:3XkePX5dSaxveLAYY7nsbsZZrKxCyEuE5pM4ziFxyGg=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26 h1:I/5wmGMffY4happ8NOCuIUEWGUvvFp5NSeQcXl9RHcI=
+github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.26/go.mod h1:FR8f4turZtNy6baO0KJ5FJUmXH/cSkI9fOngs0yl6mA=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32 h1:BjUcr3X3K0wZPGFg2bxOWW3VPN8rkE3/61zhP+IHviA=
 github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.32/go.mod h1:80+OGC/bgzzFFTUmcuwD0lb4YutwQeKLFpmt6hoWapU=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26 h1:zXFLuEuMMUOvEARXFUVJdfqZ4bvvSgdGRq/ATcrQxzM=
+github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.26/go.mod h1:3o2Wpy0bogG1kyOPrgkXA8pgIfEEv0+m19O9D5+W8y8=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32 h1:m1GeXHVMJsRsUAqG6HjZWx9dj7F5TR+cF1bjyfYyBd4=
 github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.32/go.mod h1:IitoQxGfaKdVLNg0hD8/DXmAqNy0H4K2H2Sf91ti8sI=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26 h1:GeNJsIFHB+WW5ap2Tec4K6dzcVTsRbsT1Lra46Hv9ME=
+github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.26/go.mod h1:zfgMpwHDXX2WGoG84xG2H+ZlPTkJUU4YUvx2svLQYWo=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32 h1:OIHj/nAhVzIXGzbAE+4XmZ8FPvro3THr6NlqErJc3wY=
 github.com/aws/aws-sdk-go-v2/internal/v4a v1.3.32/go.mod h1:LiBEsDo34OJXqdDlRGsilhlIiXR7DL+6Cx2f4p1EgzI=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1 h1:iXtILhvDxB6kPvEXgsDhGaZCSC6LQET5ZHSdJozeI0Y=
+github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.1/go.mod h1:9nu0fVANtYiAePIBh2/pFUSwtJ402hLnp854CNoDOeE=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2 h1:D4oz8/CzT9bAEYtVhSBmFj2dNOtaHOtMKc2vHBwYizA=
 github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.2/go.mod h1:Za3IHqTQ+yNcRHxu1OFucBh0ACZT4j4VQFF0BqpZcLY=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7 h1:tB4tNw83KcajNAzaIMhkhVI2Nt8fAZd5A5ro113FEMY=
+github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.4.7/go.mod h1:lvpyBGkZ3tZ9iSsUIcC2EWp+0ywa7aK3BLT+FwZi+mQ=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6 h1:cCBJaT7EeEojpJ4s7wTDbhZlHVJOgNHN7iw6qVurGaw=
 github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.5.6/go.mod h1:WYH1ABybY7JK9TITPnk6ZlP7gQB8psI4c9qDmMsnLSA=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7 h1:8eUsivBQzZHqe/3FE+cqwfH+0p5Jo8PFM/QYQSmeZ+M=
+github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.7/go.mod h1:kLPQvGUmxn/fqiCrDeohwG33bq2pQpGeY62yRO6Nrh0=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13 h1:SYVGSFQHlchIcy6e7x12bsrxClCXSP5et8cqVhL8cuw=
 github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.13/go.mod h1:kizuDaLX37bG5WZaoxGPQR/LNFXpxp0vsUnqfkWXfNE=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7 h1:Hi0KGbrnr57bEHWM0bJ1QcBzxLrL/k2DHvGYhb8+W1w=
+github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.7/go.mod h1:wKNgWgExdjjrm4qvfbTorkvocEstaoDl4WCvGfeCy9c=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13 h1:OBsrtam3rk8NfBEq7OLOMm5HtQ9Yyw32X4UQMya/wjw=
 github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.18.13/go.mod h1:3U4gFA5pmoCOja7aq4nSaIAGbaOHv2Yl2ug018cmC+Q=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0 h1:SAfh4pNx5LuTafKKWR02Y+hL3A+3TX8cTKG1OIAJaBk=
+github.com/aws/aws-sdk-go-v2/service/s3 v1.72.0/go.mod h1:r+xl5yzMk9083rMR+sJ5TYj9Tihvf/l1oxzZXDgGj2Q=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.76.0 h1:ehvUZNVrGA1Usa6yYo8A8pUqrigRelWXSbcCqYpRLeI=
 github.com/aws/aws-sdk-go-v2/service/s3 v1.76.0/go.mod h1:KuLNrwYJFaC2AVZ+CVVc12k9NyqwgWsoNNHjwqF6QNk=
+github.com/aws/smithy-go v1.22.1 h1:/HPHZQ0g7f4eUeK6HKglFz8uwVfZKgoI25rb/J+dnro=
+github.com/aws/smithy-go v1.22.1/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
 github.com/aws/smithy-go v1.22.2 h1:6D9hW43xKFrRx/tXXfAlIZc4JI+yQe6snnWcQyxSyLQ=
 github.com/aws/smithy-go v1.22.2/go.mod h1:irrKGvNn1InZwb2d7fkIRNucdfwR8R+Ts3wxYa/cJHg=
+github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
+github.com/cenkalti/backoff/v3 v3.2.2 h1:cfUAAO3yvKMYKPrvhDuHSwQnhZNk/RMHKdZqKTxfm6M=
+github.com/cenkalti/backoff/v3 v3.2.2/go.mod h1:cIeZDE3IrqwwJl6VUwCN6trj1oXrTS4rc0ij+ULvLYs=
 github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
 github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
-github.com/containerd/log v0.1.0 h1:TCJt7ioM2cr/tfR8GPbGf9/VRAX8D2B4PjzCpfX540I=
-github.com/containerd/log v0.1.0/go.mod h1:VRRf09a7mHDIRezVKTRCrOq78v577GXq3bSa3EhrzVo=
-github.com/containerd/platforms v0.2.1 h1:zvwtM3rz2YHPQsF2CHYM8+KtB5dvhISiXh5ZpSBQv6A=
-github.com/containerd/platforms v0.2.1/go.mod h1:XHCb+2/hzowdiut9rkudds9bE5yJ7npe7dG/wG+uFPw=
 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
-github.com/cpuguy83/dockercfg v0.3.2 h1:DlJTyZGBDlXqUZ2Dk2Q3xHs/FtnooJJVaad2S9GKorA=
-github.com/cpuguy83/dockercfg v0.3.2/go.mod h1:sugsbF4//dDlL/i+S+rtpIWp+5h0BHJHfjj5/jFyUJc=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
-github.com/creack/pty v1.1.23 h1:4M6+isWdcStXEf15G/RbrMPOQj1dZ7HPZCGwE4kOeP0=
-github.com/creack/pty v1.1.23/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
-github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/dmarkham/enumer v1.5.11 h1:quorLCaEfzjJ23Pf7PB9lyyaHseh91YfTM/sAD/4Mbo=
-github.com/dmarkham/enumer v1.5.11/go.mod h1:yixql+kDDQRYqcuBM2n9Vlt7NoT9ixgXhaXry8vmRg8=
-github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
-github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
-github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
-github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
-github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
-github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY=
 github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto=
-github.com/ebitengine/purego v0.8.2 h1:jPPGWs2sZ1UgOSgD2bClL0MJIqu58nOmIcBuXr62z1I=
-github.com/ebitengine/purego v0.8.2/go.mod h1:iIjxzd6CiRiOG0UyXP+V1+jWqUXVjPKLAI0mRfJZTmQ=
+github.com/fatih/color v1.7.0 h1:DkWD4oS2D8LGGgTQ6IvwJJXSL5Vp2ffcQg58nFV38Ys=
+github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM=
-github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE=
-github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
-github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/frankban/quicktest v1.14.5 h1:dfYrrRyLtiqT9GyKXgdh+k4inNeTvmGbuSgZ3lx3GhA=
+github.com/frankban/quicktest v1.14.5/go.mod h1:4ptaffx2x8+WTWXmUCuVU6aPUX1/Mz7zb5vbUoiM6w0=
+github.com/go-co-op/gocron v1.33.1 h1:wjX+Dg6Ae29a/f9BSQjY1Rl+jflTpW9aDyMqseCj78c=
+github.com/go-co-op/gocron v1.33.1/go.mod h1:NLi+bkm4rRSy1F8U7iacZOz0xPseMoIOnvabGoSe/no=
 github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
 github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
 github.com/go-ini/ini v1.67.0 h1:z6ZrTEZqSWOTyH2FlglNbNgARyHG8oLW9gMELqKr06A=
 github.com/go-ini/ini v1.67.0/go.mod h1:ByCAeIL28uOIIG0E3PJtZPDL8WnHpFKFOtgjp+3Ies8=
+github.com/go-jose/go-jose/v3 v3.0.0 h1:s6rrhirfEP/CGIoc6p+PZAeogN2SxKav6Wp7+dyMWVo=
+github.com/go-jose/go-jose/v3 v3.0.0/go.mod h1:RNkWWRld676jZEYoV3+XK8L2ZnNSvIsxFMht0mSX+u8=
+github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
+github.com/go-jose/go-jose/v3 v3.0.3/go.mod h1:5b+7YgP7ZICgJDBdfjZaIt+H/9L9T/YQrVfLAMboGkQ=
 github.com/go-jose/go-jose/v4 v4.0.1 h1:QVEPDE3OluqXBQZDcnNvQrInro2h0e4eqNbnZSWqS6U=
 github.com/go-jose/go-jose/v4 v4.0.1/go.mod h1:WVf9LFMHh/QVrmqrOfqun0C45tMe3RoiKJMPvgWwLfY=
-github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
-github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
-github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
-github.com/go-ole/go-ole v1.2.6 h1:/Fpf6oFPoeFik9ty7siob0G6Ke8QvQEuVcuChpwXzpY=
-github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
-github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
-github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
 github.com/go-test/deep v1.0.2 h1:onZX1rnHT3Wv6cqNgYyFOOlgVKJrksuCMCRvJStbMYw=
 github.com/go-test/deep v1.0.2/go.mod h1:wGDj63lr65AM2AQyKZd/NYHGb0R+1RLqB8NKt3aSFNA=
 github.com/go-viper/mapstructure/v2 v2.2.1 h1:ZAaOCxANMuZx5RCeg0mBdEZk7DZasvvZIxtHqx8aGss=
 github.com/go-viper/mapstructure/v2 v2.2.1/go.mod h1:oJDH3BJKyqBA2TXFhDsKDGDTlndYOZ6rGS0BRZIxGhM=
+github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM=
+github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/goccy/go-json v0.10.5 h1:Fq85nIqj+gXn/S5ahsiTlK3TmC85qgirsdTP/+DeaC4=
 github.com/goccy/go-json v0.10.5/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
-github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
-github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3 h1:5ZPtiqj0JL5oKWmcsq4VMaAW5ukBEgSGXEN89zeH1Jo=
-github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3/go.mod h1:ndYquD05frm2vACXE1nsccT4oJzjhw2arTS2cpUD1PI=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=
 github.com/hashicorp/go-cleanhttp v0.5.2/go.mod h1:kO/YDlP8L1346E6Sodw+PrpBSV4/SoxCXGY6BqNFT48=
+github.com/hashicorp/go-hclog v0.9.2/go.mod h1:5CU+agLiy3J7N7QjHK5d05KxGsuXiQLrjA0H7acj2lQ=
+github.com/hashicorp/go-hclog v0.16.2 h1:K4ev2ib4LdQETX5cSZBG0DVLk1jwGqSPXBjdah3veNs=
+github.com/hashicorp/go-hclog v0.16.2/go.mod h1:whpDNt7SSdeAju8AWKIWsul05p54N/39EeqMAyrmvFQ=
 github.com/hashicorp/go-hclog v1.6.3 h1:Qr2kF+eVWjTiYmU7Y31tYlP1h0q/X3Nl3tPGdaB11/k=
-github.com/hashicorp/go-hclog v1.6.3/go.mod h1:W4Qnvbt70Wk/zYJryRzDRU/4r0kIg0PVHBcfoyhpF5M=
+github.com/hashicorp/go-multierror v1.0.0/go.mod h1:dHtQlpGsu+cZNNAkkCN/P3hoUDHhCYQXV3UM06sGGrk=
 github.com/hashicorp/go-multierror v1.1.1 h1:H5DkEtf6CXdFp0N0Em5UCwQpXMWke8IA0+lD48awMYo=
 github.com/hashicorp/go-multierror v1.1.1/go.mod h1:iw975J/qwKPdAO1clOe2L8331t/9/fmwbPZ6JB6eMoM=
+github.com/hashicorp/go-retryablehttp v0.7.4 h1:ZQgVdpTdAL7WpMIwLzCfbalOcSUdkDZnpUv3/+BxzFA=
+github.com/hashicorp/go-retryablehttp v0.7.4/go.mod h1:Jy/gPYAdjqffZ/yFGCFV2doI5wjtH1ewM9u8iYVjtX8=
 github.com/hashicorp/go-retryablehttp v0.7.7 h1:C8hUCYzor8PIfXHa4UrZkU4VvK8o9ISHxT2Q8+VepXU=
 github.com/hashicorp/go-retryablehttp v0.7.7/go.mod h1:pkQpWZeYWskR+D1tR2O5OcBFOxfA7DoAO6xtkuQnHTk=
 github.com/hashicorp/go-rootcerts v1.0.2 h1:jzhAVGtqPKbwpyCPELlgNWhE1znq+qwJtW5Oi2viEzc=
 github.com/hashicorp/go-rootcerts v1.0.2/go.mod h1:pqUvnprVnM5bf7AOirdbb01K4ccR319Vf4pU3K5EGc8=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7 h1:UpiO20jno/eV1eVZcxqWnUohyKRe1g8FPV/xH1s/2qs=
+github.com/hashicorp/go-secure-stdlib/parseutil v0.1.7/go.mod h1:QmrqtbKuxxSWTN3ETMPuB+VtEiBJ/A9XhoYGv8E1uD8=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9 h1:FW0YttEnUNDJ2WL9XcrrfteS1xW8u+sh4ggM8pN5isQ=
 github.com/hashicorp/go-secure-stdlib/parseutil v0.1.9/go.mod h1:Ll013mhdmsVDuoIXVfBtvgGJsXDYkTw1kooNcoCXuE0=
+github.com/hashicorp/go-secure-stdlib/strutil v0.1.1/go.mod h1:gKOamz3EwoIoJq7mlMIRBpVTAUn8qPCrEclOKKWhD3U=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2 h1:kes8mmyCpxJsI7FTwtzRqEy9CdjCtrXrXGuOpxEA7Ts=
 github.com/hashicorp/go-secure-stdlib/strutil v0.1.2/go.mod h1:Gou2R9+il93BqX25LAKCLuM+y9U2T4hlwvT1yprcna4=
+github.com/hashicorp/go-sockaddr v1.0.2/go.mod h1:rB4wwRAUzs07qva3c5SdrY/NEtAUjGlgmH/UkBUC97A=
+github.com/hashicorp/go-sockaddr v1.0.5 h1:dvk7TIXCZpmfOlM+9mlcrWmWjw/wlKT+VDq2wMvfPJU=
+github.com/hashicorp/go-sockaddr v1.0.5/go.mod h1:uoUUmtwU7n9Dv3O4SNLeFvg0SxQ3lyjsj6+CCykpaxI=
 github.com/hashicorp/go-sockaddr v1.0.7 h1:G+pTkSO01HpR5qCxg7lxfsFEZaG+C0VssTy/9dbT+Fw=
 github.com/hashicorp/go-sockaddr v1.0.7/go.mod h1:FZQbEYa1pxkQ7WLpyXJ6cbjpT8q0YgQaK/JakXqGyWw=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
+github.com/hashicorp/vault/api v1.10.0 h1:/US7sIjWN6Imp4o/Rj1Ce2Nr5bki/AXi9vAW3p2tOJQ=
+github.com/hashicorp/vault/api v1.10.0/go.mod h1:jo5Y/ET+hNyz+JnKDt8XLAdKs+AM0G5W0Vp1IrFI8N8=
 github.com/hashicorp/vault/api v1.15.0 h1:O24FYQCWwhwKnF7CuSqP30S51rTV7vz1iACXE/pj5DA=
 github.com/hashicorp/vault/api v1.15.0/go.mod h1:+5YTO09JGn0u+b6ySD/LLVf8WkJCPLAL2Vkmrn2+CM8=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
@ -127,8 +137,6 @@ github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible
 github.com/jordan-wright/email v4.0.1-0.20210109023952-943e75fe5223+incompatible/go.mod h1:1c7szIrayyPPB/987hsnvNzLushdWf4o/79s3P08L8A=
 github.com/kevinburke/ssh_config v1.2.0 h1:x584FjTGwHzMwvHx18PXxbBVzfnxogHaAReU4gf13a4=
 github.com/kevinburke/ssh_config v1.2.0/go.mod h1:CT57kijsi8u/K/BOFA39wgDQJ9CxiF4nAY/ojJ6r6mM=
-github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
-github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/klauspost/compress v1.17.11 h1:In6xLpyWOi1+C7tXUUWv2ot1QvBjxevKAaI6IXrJmUc=
 github.com/klauspost/compress v1.17.11/go.mod h1:pMDklpSncoRMuLFrf1W9Ss9KT+0rH90U12bZKk7uwG0=
 github.com/klauspost/cpuid/v2 v2.0.1/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
@ -140,10 +148,10 @@ github.com/knadh/koanf/parsers/yaml v0.1.0 h1:ZZ8/iGfRLvKSaMEECEBPM1HQslrZADk8fP
 github.com/knadh/koanf/parsers/yaml v0.1.0/go.mod h1:cvbUDC7AL23pImuQP0oRw/hPuccrNBS2bps8asS0CwY=
 github.com/knadh/koanf/providers/rawbytes v0.1.0 h1:dpzgu2KO6uf6oCb4aP05KDmKmAmI51k5pe8RYKQ0qME=
 github.com/knadh/koanf/providers/rawbytes v0.1.0/go.mod h1:mMTB1/IcJ/yE++A2iEZbY1MLygX7vttU+C+S/YmPu9c=
+github.com/knadh/koanf/v2 v2.0.1 h1:1dYGITt1I23x8cfx8ZnldtezdyaZtfAuRtIFOiRzK7g=
+github.com/knadh/koanf/v2 v2.0.1/go.mod h1:ZeiIlIDXTE7w1lMT6UVcNiRAS2/rCeLn/GdLNvY1Dus=
 github.com/knadh/koanf/v2 v2.1.2 h1:I2rtLRqXRy1p01m/utEtpZSSA6dcJbgGVuE27kW2PzQ=
 github.com/knadh/koanf/v2 v2.1.2/go.mod h1:Gphfaen0q1Fc1HTgJgSTC4oRX9R2R5ErYMZJy8fLJBo=
-github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8=
-github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
@ -153,14 +161,16 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4=
-github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I=
-github.com/magiconair/properties v1.8.10 h1:s31yESBquKXCV9a/ScB3ESkOjUYYv+X0rg8SYxI99mE=
-github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
+github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
 github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
 github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
@ -168,67 +178,53 @@ github.com/minio/md5-simd v1.1.2 h1:Gdi1DZK69+ZVMoNHRXJyNcxrMA4dSxoYHZSQbirFg34=
 github.com/minio/md5-simd v1.1.2/go.mod h1:MzdKDxYpY2BT9XQFocsiZf/NKVtR7nkE4RoEpN+20RM=
 github.com/minio/minio-go/v7 v7.0.84 h1:D1HVmAF8JF8Bpi6IU4V9vIEj+8pc+xU88EWMs2yed0E=
 github.com/minio/minio-go/v7 v7.0.84/go.mod h1:57YXpvc5l3rjPdhqNrDsvVlY0qPI6UTk1bflAe+9doY=
+github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
 github.com/mitchellh/copystructure v1.2.0 h1:vpKXTN4ewci03Vljg/q9QvCGUDttBOGBIa15WveJJGw=
 github.com/mitchellh/copystructure v1.2.0/go.mod h1:qLl+cE2AmVv+CoeAwDPye/v+N2HKCj9FbZEVFJRxO9s=
 github.com/mitchellh/go-homedir v1.1.0 h1:lukF9ziXFxDFPkA1vsr5zpc1XuPDn/wFntq5mG+4E0Y=
 github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0=
+github.com/mitchellh/go-wordwrap v1.0.0/go.mod h1:ZXFpozHsX6DPmq2I0TCekCxypsnAUbP2oI0UX1GXzOo=
+github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
 github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
-github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
-github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/moby/patternmatcher v0.6.0 h1:GmP9lR19aU5GqSSFko+5pRqHi+Ohk1O69aFiKkVGiPk=
-github.com/moby/patternmatcher v0.6.0/go.mod h1:hDPoyOpDY7OrrMDLaYoY3hf52gNCR/YOUYxkhApJIxc=
-github.com/moby/sys/sequential v0.5.0 h1:OPvI35Lzn9K04PBbCLW0g4LcFAJgHsvXsRyewg5lXtc=
-github.com/moby/sys/sequential v0.5.0/go.mod h1:tH2cOOs5V9MlPiXcQzRC+eEyab644PWKGRYaaV5ZZlo=
-github.com/moby/sys/user v0.1.0 h1:WmZ93f5Ux6het5iituh9x2zAG7NFY9Aqi49jjE1PaQg=
-github.com/moby/sys/user v0.1.0/go.mod h1:fKJhFOnsCN6xZ5gSfbM6zaHGgDJMrqt9/reuj4T7MmU=
-github.com/moby/sys/userns v0.1.0 h1:tVLXkFOxVu9A64/yh59slHVv9ahO9UIev4JZusOLG/g=
-github.com/moby/sys/userns v0.1.0/go.mod h1:IHUYgu/kao6N8YZlp9Cf444ySSvCmDlmzUcYfDHOl28=
-github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
-github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
-github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
-github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
+github.com/nikoksr/notify v0.41.0 h1:4LGE41GpWdHX5M3Xo6DlWRwS2WLDbOq1Rk7IzY4vjmQ=
+github.com/nikoksr/notify v0.41.0/go.mod h1:FoE0UVPeopz1Vy5nm9vQZ+JVmYjEIjQgbFstbkw+cRE=
 github.com/nikoksr/notify v1.3.0 h1:UxzfxzAYGQD9a5JYLBTVx0lFMxeHCke3rPCkfWdPgLs=
 github.com/nikoksr/notify v1.3.0/go.mod h1:Xor2hMmkvrCfkCKvXGbcrESez4brac2zQjhd6U2BbeM=
-github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
-github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
-github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
-github.com/opencontainers/image-spec v1.1.1/go.mod h1:qpqAh3Dmcf36wStyyWU+kCeDgrGnAve2nCC8+7h8Q0M=
-github.com/pascaldekloe/name v1.0.0 h1:n7LKFgHixETzxpRv2R77YgPUFo85QHGZKrdaYm7eY5U=
-github.com/pascaldekloe/name v1.0.0/go.mod h1:Z//MfYJnH4jVpQ9wkclwu2I2MkHmXTlT9wR5UZScttM=
 github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pkg/sftp v1.13.7 h1:uv+I3nNJvlKZIQGSr8JVQLNHFU9YhhNpvC14Y6KgmSM=
-github.com/pkg/sftp v1.13.7/go.mod h1:KMKI0t3T6hfA+lTR/ssZdunHo+uwq7ghoN09/FSu3DY=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
-github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
+github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
 github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
 github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8=
+github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4=
 github.com/rogpeppe/go-internal v1.13.1 h1:KvO1DLK/DRN07sQ1LQKScxyZJuNnedQ5/wKSR38lUII=
 github.com/rogpeppe/go-internal v1.13.1/go.mod h1:uMEvuHeurkdAXX61udpOXGD/AzZDWNMNyH2VO9fmH0o=
 github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
 github.com/rs/xid v1.6.0 h1:fV591PaemRlL6JfRxGDEPl69wICngIQ3shQtzfy2gxU=
 github.com/rs/xid v1.6.0/go.mod h1:7XoLgs4eV+QndskICGsho+ADou8ySMSjJKDIan90Nz0=
+github.com/rs/zerolog v1.30.0 h1:SymVODrcRsaRaSInD9yQtKbtWqwsfoPcRff/oRXLj4c=
+github.com/rs/zerolog v1.30.0/go.mod h1:/tk+P47gFdPXq4QYjvCmT5/Gsug2nagsFWBWhAiSi1w=
 github.com/rs/zerolog v1.33.0 h1:1cU2KZkvPxNyfgEmhHAz/1A9Bz+llsdYzklWFzgp0r8=
 github.com/rs/zerolog v1.33.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
+github.com/ryanuber/columnize v2.1.0+incompatible/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk=
 github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc=
 github.com/sethvargo/go-password v0.3.1 h1:WqrLTjo7X6AcVYfC6R7GtSyuUQR9hGyAj/f1PYQZCJU=
 github.com/sethvargo/go-password v0.3.1/go.mod h1:rXofC1zT54N7R8K/h1WDUdkf9BOx5OptoxrMBcrXzvs=
-github.com/shirou/gopsutil/v4 v4.25.1 h1:QSWkTc+fu9LTAWfkZwZ6j8MSUk4A2LV7rbH0ZqmLjXs=
-github.com/shirou/gopsutil/v4 v4.25.1/go.mod h1:RoUCUpndaJFtT+2zsZzzmhvbfGoDCJ7nFXKJf8GqJbI=
-github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
-github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I=
+github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0=
 github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
 github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
 github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
@ -237,16 +233,18 @@ github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSS
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY=
 github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
 github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/testcontainers/testcontainers-go v0.37.0 h1:L2Qc0vkTw2EHWQ08djon0D2uw7Z/PtHS/QzZZ5Ra/hg=
-github.com/testcontainers/testcontainers-go v0.37.0/go.mod h1:QPzbxZhQ6Bclip9igjLFj6z0hs01bU8lrl2dHQmgFGM=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.16.0 h1:SyXa+dsSPpUlcwEDuKuEBJEz5vzTvOea+9rjyYodQFg=
+github.com/tidwall/gjson v1.16.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/gjson v1.18.0 h1:FIDeeyB800efLX89e5a8Y0BNH+LOngJyGrIWxG2FKQY=
 github.com/tidwall/gjson v1.18.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
@ -256,128 +254,92 @@ github.com/tidwall/pretty v1.2.1 h1:qjsOFOWWQl+N3RsoF5/ssm1pHmJJwhjlSbZ51I6wMl4=
 github.com/tidwall/pretty v1.2.1/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=
 github.com/tidwall/sjson v1.2.5 h1:kLy8mja+1c9jlljvWTlSazM7cKDRfJuR/bOJhcY5NcY=
 github.com/tidwall/sjson v1.2.5/go.mod h1:Fvgq9kS/6ociJEDnK0Fk1cpYF4FIW6ZF7LAe+6jwd28=
-github.com/tklauser/go-sysconf v0.3.12 h1:0QaGUFOdQaIVdPgfITYzaTegZvdCjmYO52cSFAEVmqU=
-github.com/tklauser/go-sysconf v0.3.12/go.mod h1:Ho14jnntGE1fpdOqQEEaiKRpvIavV0hSfmBq8nJbHYI=
-github.com/tklauser/numcpus v0.6.1 h1:ng9scYS7az0Bk4OZLvrNXNSAO2Pxr1XXRAPyjhIx+Fk=
-github.com/tklauser/numcpus v0.6.1/go.mod h1:1XfjsgE2zo8GVw7POkMbHENHzVg3GzmoZ9fESEdAacY=
-github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-github.com/yusufpapurcu/wmi v1.2.4 h1:zFUKzehAFReQwLys1b/iSMl+JQGSCSjtVqQn9bBrPo0=
-github.com/yusufpapurcu/wmi v1.2.4/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0=
+go.mau.fi/util v0.0.0-20230906155759-14bad39a8718 h1:hmm5bZqE0M8+Uvys0HJPCSbAIZIwYtTkBKYPjAWHuMM=
+go.mau.fi/util v0.0.0-20230906155759-14bad39a8718/go.mod h1:AxuJUMCxpzgJ5eV9JbPWKRH8aAJJidxetNdUj7qcb84=
 go.mau.fi/util v0.8.4 h1:mVKlJcXWfVo8ZW3f4vqtjGpqtZqJvX4ETekxawt2vnQ=
 go.mau.fi/util v0.8.4/go.mod h1:MOfGTs1CBuK6ERTcSL4lb5YU7/ujz09eOPVEDckuazY=
-go.opentelemetry.io/auto/sdk v1.1.0 h1:cH53jehLUN6UFLY71z+NDOiNJqDdPRaXzTel0sJySYA=
-go.opentelemetry.io/auto/sdk v1.1.0/go.mod h1:3wSPjt5PWp2RhlCcmmOial7AvC4DQqZb7a7wCow3W8A=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0 h1:DheMAlT6POBP+gh8RUH19EOTnQIor5QE0uSRPtzCpSw=
-go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.57.0/go.mod h1:wZcGmeVO9nzP67aYSLDqXNWK87EZWhi7JWj1v7ZXf94=
-go.opentelemetry.io/otel v1.36.0 h1:UumtzIklRBY6cI/lllNZlALOF5nNIzJVb16APdvgTXg=
-go.opentelemetry.io/otel v1.36.0/go.mod h1:/TcFMXYjyRNh8khOAO9ybYkqaDBb/70aVwkNML4pP8E=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0 h1:dNzwXjZKpMpE2JhmO+9HsPl42NIXFIFSUSSs0fiqra0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.36.0/go.mod h1:90PoxvaEB5n6AOdZvi+yWJQoE95U8Dhhw2bSyRqnTD0=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0 h1:IeMeyr1aBvBiPVYihXIaeIZba6b8E1bYp7lbdxK8CQg=
-go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.19.0/go.mod h1:oVdCUtjq9MK9BlS7TtucsQwUcXcymNiEDjgDD2jMtZU=
-go.opentelemetry.io/otel/metric v1.36.0 h1:MoWPKVhQvJ+eeXWHFBOPoBOi20jh6Iq2CcCREuTYufE=
-go.opentelemetry.io/otel/metric v1.36.0/go.mod h1:zC7Ks+yeyJt4xig9DEw9kuUFe5C3zLbVjV2PzT6qzbs=
-go.opentelemetry.io/otel/sdk v1.36.0 h1:b6SYIuLRs88ztox4EyrvRti80uXIFy+Sqzoh9kFULbs=
-go.opentelemetry.io/otel/sdk v1.36.0/go.mod h1:+lC+mTgD+MUWfjJubi2vvXWcVxyr9rmlshZni72pXeY=
-go.opentelemetry.io/otel/trace v1.36.0 h1:ahxWNuqZjpdiFAyrIoQ4GIiAIhxAunQR6MUoKrsNd4w=
-go.opentelemetry.io/otel/trace v1.36.0/go.mod h1:gQ+OnDZzrybY4k4seLzPAWNwVBBVlF2szhehOBB/tGA=
-go.opentelemetry.io/proto/otlp v1.7.0 h1:jX1VolD6nHuFzOYso2E73H85i92Mv8JQYk0K9vz09os=
-go.opentelemetry.io/proto/otlp v1.7.0/go.mod h1:fSKjH6YJ7HDlwzltzyMj036AJ3ejJLCgCSHGj4efDDo=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.11.0 h1:ZvwS0R+56ePWxUNi+Atn9dWONBPp/AUETXlHW0DxSjE=
 go.uber.org/atomic v1.11.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.0.0-20190911031432-227b76d455e7/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.17.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
+golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
+golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U=
+golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk=
+golang.org/x/crypto v0.33.0 h1:IOBPskki6Lysi0lo9qQvbxiQ+FvsCC/YWOecCHAixus=
+golang.org/x/crypto v0.33.0/go.mod h1:bVdXmD7IV/4GdElGPozy6U7lWdRXA4qyRVGJV57uQ5M=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0LeHDbnYEryqj5Q1ug8=
+golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
 golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3 h1:qNgPs5exUA+G0C96DrPwNrvLSj7GT/9D+3WMWUcUg34=
 golang.org/x/exp v0.0.0-20250207012021-f9890c6ad9f3/go.mod h1:tujkw807nyEEAamNbDrEGzRav+ilXA7PCRAd6xsmwiU=
-golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
-golang.org/x/mod v0.23.0 h1:Zb7khfcRGKk+kqfxFaP5tZqCnDZMjC5VtUBs87Hr6QM=
-golang.org/x/mod v0.23.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
-golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
 golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
-golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
+golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.11.0 h1:GGz8+XQP4FvTTrjZPzNKTMFtSXH80RAzG+5ghFPgK9w=
+golang.org/x/sync v0.11.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210616094352-59db8d763f22/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
-golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
+golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.30.0 h1:QjkSwP/36a20jFYWkSue1YwXzLmsV5Gfq7Eiy72C1uc=
+golang.org/x/sys v0.30.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
 golang.org/x/term v0.8.0/go.mod h1:xPskH00ivmX89bAKVGSKKtLOWNx2+17Eiy94tnKShWo=
-golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
-golang.org/x/term v0.32.0 h1:DR4lr0TjUs3epypdhTOkMmuF5CDFJ/8pOnbzMZPQ7bg=
-golang.org/x/term v0.32.0/go.mod h1:uZG1FhGx848Sqfsq4/DlJr3xGGsYMu/L5GW4abiaEPQ=
+golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
+golang.org/x/term v0.27.0 h1:WP60Sv1nlK1T6SupCHbXzSaN0b9wUmsPoRS9b61A23Q=
+golang.org/x/term v0.27.0/go.mod h1:iMsnZpn0cago0GOrHO2+Y7u7JPn5AylBrcoWkElMTSM=
+golang.org/x/term v0.29.0 h1:L6pJp37ocefwRRtYPKSWOWzOtWSxVajvz2ldH/xi3iU=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
+golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
+golang.org/x/text v0.22.0 h1:bofq7m3/HAFvbF51jz3Q9wLg3jkvSPuiZu/pD1XwgtM=
+golang.org/x/text v0.22.0/go.mod h1:YRoo4H8PVmsu+E3Ou7cqLVH8oXWIHVoX0jqUWALQhfY=
+golang.org/x/time v0.3.0 h1:rg5rLMjNzMS1RkNLzCG38eapWhnYLFYXDXj2gOlr8j4=
+golang.org/x/time v0.3.0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.10.0 h1:3usCWA8tQn0L8+hFJQNgzpWbd89begxN66o1Ojdn5L4=
 golang.org/x/time v0.10.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
-golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
-golang.org/x/tools v0.30.0 h1:BgcpHewrV5AUp2G9MebG4XPFI1E2W41zU1SaqVA9vJY=
-golang.org/x/tools v0.30.0/go.mod h1:c347cR/OJfw5TI+GfX7RUPNMdDRRbjvYTS0jPyvsVtY=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-google.golang.org/genproto v0.0.0-20241118233622-e639e219e697 h1:ToEetK57OidYuqD4Q5w+vfEnPvPpuTwedCNVohYJfNk=
-google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a h1:SGktgSolFCo75dnHJF2yMvnns6jCmHFJ0vE4Vn2JKvQ=
-google.golang.org/genproto/googleapis/api v0.0.0-20250528174236-200df99c418a/go.mod h1:a77HrdMjoeKbnd2jmgcWdaS++ZLZAEq3orIOAEIKiVw=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a h1:v2PbRU4K3llS09c7zodFpNePeamkAwG3mPrAery9VeE=
-google.golang.org/genproto/googleapis/rpc v0.0.0-20250528174236-200df99c418a/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
-google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
-google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
-google.golang.org/protobuf v1.36.6 h1:z1NpPI8ku2WgiWnf+t9wTPsn6eP1L7ksHUlkfLvd9xY=
-google.golang.org/protobuf v1.36.6/go.mod h1:jduwjTPXsFjZGTmRluh+L6NjiWu7pchiJ2/5YcXBHnY=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
@ -388,9 +350,13 @@ gopkg.in/natefinch/lumberjack.v2 v2.2.1/go.mod h1:YD8tP3GAjkrDg1eZH7EGmyESg/lsYs
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=
-gotest.tools/v3 v3.5.1/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
+maunium.net/go/maulogger/v2 v2.4.1 h1:N7zSdd0mZkB2m2JtFUsiGTQQAdP0YeFWT7YMc80yAL8=
+maunium.net/go/maulogger/v2 v2.4.1/go.mod h1:omPuYwYBILeVQobz8uO3XC8DIRuEb5rXYlQSuqrbCho=
+maunium.net/go/mautrix v0.16.0 h1:iUqCzJE2yqBC1ddAK6eAn159My8rLb4X8g4SFtQh2Dk=
+maunium.net/go/mautrix v0.16.0/go.mod h1:XAjE9pTSGcr6vXaiNgQGiip7tddJ8FQV1a29u2QdBG4=
 maunium.net/go/mautrix v0.23.0 h1:HNlR19eew5lvrNSL2muhExaGhYdaGk5FfEiA82QqUP4=
 maunium.net/go/mautrix v0.23.0/go.mod h1:AGnnaz3ylGikUo1I1MJVn9QLsl2No1/ZNnGDyO0QD5s=
+mvdan.cc/sh/v3 v3.7.0 h1:lSTjdP/1xsddtaKfGg7Myu7DnlHItd3/M2tomOcNNBg=
+mvdan.cc/sh/v3 v3.7.0/go.mod h1:K2gwkaesF/D7av7Kxl0HbF5kGOd2ArupNTX3X44+8l8=
 mvdan.cc/sh/v3 v3.10.0 h1:v9z7N1DLZ7owyLM/SXZQkBSXcwr2IGMm2LY2pmhVXj4=
 mvdan.cc/sh/v3 v3.10.0/go.mod h1:z/mSSVyLFGZzqb3ZIKojjyqIx/xbmz/UHdCSv9HmqXY=
--- a/pkg/backy/allowedexternaldirectives_enumer.go
+++ b/pkg/backy/allowedexternaldirectives_enumer.go
@ -1,149 +0,0 @@
-// Code generated by "enumer -linecomment -yaml -text -json -type=AllowedExternalDirectives"; DO NOT EDIT.
-
-package backy
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-const _AllowedExternalDirectivesName = "DefaultExternalDirvaultvault-envvault-filevault-file-envfile-envfileenv"
-
-var _AllowedExternalDirectivesIndex = [...]uint8{0, 18, 23, 32, 42, 56, 64, 68, 71}
-
-const _AllowedExternalDirectivesLowerName = "defaultexternaldirvaultvault-envvault-filevault-file-envfile-envfileenv"
-
-func (i AllowedExternalDirectives) String() string {
-	if i < 0 || i >= AllowedExternalDirectives(len(_AllowedExternalDirectivesIndex)-1) {
-		return fmt.Sprintf("AllowedExternalDirectives(%d)", i)
-	}
-	return _AllowedExternalDirectivesName[_AllowedExternalDirectivesIndex[i]:_AllowedExternalDirectivesIndex[i+1]]
-}
-
-// An "invalid array index" compiler error signifies that the constant values have changed.
-// Re-run the stringer command to generate them again.
-func _AllowedExternalDirectivesNoOp() {
-	var x [1]struct{}
-	_ = x[DefaultExternalDir-(0)]
-	_ = x[AllowedExternalDirectiveVault-(1)]
-	_ = x[AllowedExternalDirectiveVaultEnv-(2)]
-	_ = x[AllowedExternalDirectiveVaultFile-(3)]
-	_ = x[AllowedExternalDirectiveAll-(4)]
-	_ = x[AllowedExternalDirectiveFileEnv-(5)]
-	_ = x[AllowedExternalDirectiveFile-(6)]
-	_ = x[AllowedExternalDirectiveEnv-(7)]
-}
-
-var _AllowedExternalDirectivesValues = []AllowedExternalDirectives{DefaultExternalDir, AllowedExternalDirectiveVault, AllowedExternalDirectiveVaultEnv, AllowedExternalDirectiveVaultFile, AllowedExternalDirectiveAll, AllowedExternalDirectiveFileEnv, AllowedExternalDirectiveFile, AllowedExternalDirectiveEnv}
-
-var _AllowedExternalDirectivesNameToValueMap = map[string]AllowedExternalDirectives{
-	_AllowedExternalDirectivesName[0:18]:       DefaultExternalDir,
-	_AllowedExternalDirectivesLowerName[0:18]:  DefaultExternalDir,
-	_AllowedExternalDirectivesName[18:23]:      AllowedExternalDirectiveVault,
-	_AllowedExternalDirectivesLowerName[18:23]: AllowedExternalDirectiveVault,
-	_AllowedExternalDirectivesName[23:32]:      AllowedExternalDirectiveVaultEnv,
-	_AllowedExternalDirectivesLowerName[23:32]: AllowedExternalDirectiveVaultEnv,
-	_AllowedExternalDirectivesName[32:42]:      AllowedExternalDirectiveVaultFile,
-	_AllowedExternalDirectivesLowerName[32:42]: AllowedExternalDirectiveVaultFile,
-	_AllowedExternalDirectivesName[42:56]:      AllowedExternalDirectiveAll,
-	_AllowedExternalDirectivesLowerName[42:56]: AllowedExternalDirectiveAll,
-	_AllowedExternalDirectivesName[56:64]:      AllowedExternalDirectiveFileEnv,
-	_AllowedExternalDirectivesLowerName[56:64]: AllowedExternalDirectiveFileEnv,
-	_AllowedExternalDirectivesName[64:68]:      AllowedExternalDirectiveFile,
-	_AllowedExternalDirectivesLowerName[64:68]: AllowedExternalDirectiveFile,
-	_AllowedExternalDirectivesName[68:71]:      AllowedExternalDirectiveEnv,
-	_AllowedExternalDirectivesLowerName[68:71]: AllowedExternalDirectiveEnv,
-}
-
-var _AllowedExternalDirectivesNames = []string{
-	_AllowedExternalDirectivesName[0:18],
-	_AllowedExternalDirectivesName[18:23],
-	_AllowedExternalDirectivesName[23:32],
-	_AllowedExternalDirectivesName[32:42],
-	_AllowedExternalDirectivesName[42:56],
-	_AllowedExternalDirectivesName[56:64],
-	_AllowedExternalDirectivesName[64:68],
-	_AllowedExternalDirectivesName[68:71],
-}
-
-// AllowedExternalDirectivesString retrieves an enum value from the enum constants string name.
-// Throws an error if the param is not part of the enum.
-func AllowedExternalDirectivesString(s string) (AllowedExternalDirectives, error) {
-	if val, ok := _AllowedExternalDirectivesNameToValueMap[s]; ok {
-		return val, nil
-	}
-
-	if val, ok := _AllowedExternalDirectivesNameToValueMap[strings.ToLower(s)]; ok {
-		return val, nil
-	}
-	return 0, fmt.Errorf("%s does not belong to AllowedExternalDirectives values", s)
-}
-
-// AllowedExternalDirectivesValues returns all values of the enum
-func AllowedExternalDirectivesValues() []AllowedExternalDirectives {
-	return _AllowedExternalDirectivesValues
-}
-
-// AllowedExternalDirectivesStrings returns a slice of all String values of the enum
-func AllowedExternalDirectivesStrings() []string {
-	strs := make([]string, len(_AllowedExternalDirectivesNames))
-	copy(strs, _AllowedExternalDirectivesNames)
-	return strs
-}
-
-// IsAAllowedExternalDirectives returns "true" if the value is listed in the enum definition. "false" otherwise
-func (i AllowedExternalDirectives) IsAAllowedExternalDirectives() bool {
-	for _, v := range _AllowedExternalDirectivesValues {
-		if i == v {
-			return true
-		}
-	}
-	return false
-}
-
-// MarshalJSON implements the json.Marshaler interface for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.String())
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return fmt.Errorf("AllowedExternalDirectives should be a string, got %s", data)
-	}
-
-	var err error
-	*i, err = AllowedExternalDirectivesString(s)
-	return err
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalText() ([]byte, error) {
-	return []byte(i.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalText(text []byte) error {
-	var err error
-	*i, err = AllowedExternalDirectivesString(string(text))
-	return err
-}
-
-// MarshalYAML implements a YAML Marshaler for AllowedExternalDirectives
-func (i AllowedExternalDirectives) MarshalYAML() (interface{}, error) {
-	return i.String(), nil
-}
-
-// UnmarshalYAML implements a YAML Unmarshaler for AllowedExternalDirectives
-func (i *AllowedExternalDirectives) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-
-	var err error
-	*i, err = AllowedExternalDirectivesString(s)
-	return err
-}
--- a/pkg/backy/backy.go
+++ b/pkg/backy/backy.go
@ -11,7 +11,6 @@ import (
 	"io"
 	"os"
 	"os/exec"
-	"strings"
 	"text/template"

 	"embed"
@ -35,7 +34,7 @@ var Sprintf = fmt.Sprintf
 func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([]string, error) {

 	var (
-		ArgsStr       string
+		ArgsStr       string // concatenating the arguments
 		cmdOutBuf     bytes.Buffer
 		cmdOutWriters io.Writer
 		errSSH        error
@ -48,42 +47,36 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
 		outputArr []string // holds the output strings returned by processes
 	)

-	// Getting the command type must be done before concatenating the arguments
-	command = getCommandTypeAndSetCommandInfo(command)
+	// Get the command type
+	// This must be done before concatenating the arguments
+	command = getCommandType(command)

 	for _, v := range command.Args {
 		ArgsStr += fmt.Sprintf(" %s", v)
 	}

-	if command.Type == UserCommandType {
+	// print the user's password if it is updated
+	if command.Type == "user" {
 		if command.UserOperation == "password" {
 			cmdCtxLogger.Info().Str("password", command.UserPassword).Msg("user password to be updated")
 		}
 	}

-	if !IsHostLocal(command.Host) {
-
-		outputArr, errSSH = command.RunCmdOnHost(cmdCtxLogger, opts)
+	// is host defined
+	if command.Host != nil {
+		outputArr, errSSH = command.RunCmdSSH(cmdCtxLogger, opts)
 		if errSSH != nil {
 			return outputArr, errSSH
 		}
 	} else {

 		// Handle package operations
-		if command.Type == PackageCommandType && command.PackageOperation == PackageOperationCheckVersion {
-			opts.Logger.Info().Msg("")
-			for _, p := range command.Packages {
-				cmdCtxLogger.Info().Str("package", p.Name).Msg("Checking installed and remote package versions")
-			}
-			opts.Logger.Info().Msg("")
+		if command.Type == "package" && command.PackageOperation == "checkVersion" {
+			cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Checking package versions")

 			// Execute the package version command
 			cmd := exec.Command(command.Cmd, command.Args...)
 			cmdOutWriters = io.MultiWriter(&cmdOutBuf)
-
-			if IsCmdStdOutEnabled() {
-				cmdOutWriters = io.MultiWriter(os.Stdout, &cmdOutBuf)
-			}
 			cmd.Stdout = cmdOutWriters
 			cmd.Stderr = cmdOutWriters

@ -95,67 +88,7 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
 		}

 		var localCMD *exec.Cmd
-
-		if command.Type == RemoteScriptCommandType {
-			script, err := command.Fetcher.Fetch(command.Cmd)
-			if err != nil {
-				return nil, err
-			}
-
-			if command.Shell == "" {
-				command.Shell = "sh"
-			}
-			localCMD = exec.Command(command.Shell, command.Args...)
-			injectEnvIntoLocalCMD(envVars, localCMD, cmdCtxLogger, opts)
-
-			cmdOutWriters = io.MultiWriter(&cmdOutBuf)
-
-			if IsCmdStdOutEnabled() {
-				cmdOutWriters = io.MultiWriter(os.Stdout, &cmdOutBuf)
-			}
-			if command.Output.File != "" {
-				file, err := os.Create(command.Output.File)
-				if err != nil {
-					return nil, fmt.Errorf("error creating output file: %w", err)
-				}
-				defer file.Close()
-				cmdOutWriters = io.MultiWriter(file, &cmdOutBuf)
-
-				if IsCmdStdOutEnabled() {
-					cmdOutWriters = io.MultiWriter(os.Stdout, file, &cmdOutBuf)
-				}
-
-			}
-
-			localCMD.Stdin = bytes.NewReader(script)
-			localCMD.Stdout = cmdOutWriters
-			localCMD.Stderr = cmdOutWriters
-
-			cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running remoteScript %s on local machine in %s", command.Cmd, command.Shell)).Send()
-			err = localCMD.Run()
-			if err != nil {
-				return nil, fmt.Errorf("error running remote script: %w", err)
-			}
-
-			outScanner := bufio.NewScanner(&cmdOutBuf)
-
-			for outScanner.Scan() {
-				outMap := make(map[string]interface{})
-				outMap["cmd"] = command.Cmd
-				outMap["output"] = outScanner.Text()
-
-				if str, ok := outMap["output"].(string); ok {
-					outputArr = append(outputArr, str)
-				}
-				if command.Output.ToLog {
-					cmdCtxLogger.Info().Fields(outMap).Send()
-				}
-			}
-			return outputArr, nil
-		}
-
 		var err error
-
 		if command.Shell != "" {
 			cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine in %s", command.Name, command.Shell)).Send()

@ -168,10 +101,8 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
 			cmdCtxLogger.Info().Str("Command", fmt.Sprintf("Running command %s on local machine", command.Name)).Send()

 			// execute package commands in a shell
-			if command.Type == PackageCommandType {
-				for _, p := range command.Packages {
-					cmdCtxLogger.Info().Str("packages", p.Name).Msg("Executing package command")
-				}
+			if command.Type == "package" {
+				cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Executing package command")
 				ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr)
 				localCMD = exec.Command("/bin/sh", "-c", ArgsStr)
 			} else {
@ -179,17 +110,11 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([
 			}
 		}

-		if command.Type == UserCommandType {
-			if command.UserOperation == "password" {
-				localCMD.Stdin = command.stdin
-				cmdCtxLogger.Info().Str("password", command.UserPassword).Msg("user password to be updated")
-			}
-		}
 		if command.Dir != nil {
 			localCMD.Dir = *command.Dir
 		}

-		injectEnvIntoLocalCMD(envVars, localCMD, cmdCtxLogger, opts)
+		injectEnvIntoLocalCMD(envVars, localCMD, cmdCtxLogger)

 		cmdOutWriters = io.MultiWriter(&cmdOutBuf)

@ -202,84 +127,38 @@ func (command *Command) RunCmd(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([

 		err = localCMD.Run()

-		outputArr = logCommandOutput(command, cmdOutBuf, cmdCtxLogger, outputArr)
+		outScanner := bufio.NewScanner(&cmdOutBuf)
+
+		for outScanner.Scan() {
+			outMap := make(map[string]interface{})
+			outMap["cmd"] = command.Cmd
+			outMap["output"] = outScanner.Text()
+
+			if str, ok := outMap["output"].(string); ok {
+				outputArr = append(outputArr, str)
+			}
+			// if command.GetOutput {
+			cmdCtxLogger.Info().Fields(outMap).Send()
+			// }
+		}
 		if err != nil {
 			cmdCtxLogger.Error().Err(fmt.Errorf("error when running cmd %s: %w", command.Name, err)).Send()
 			return outputArr, err
 		}
-
-		if command.Type == UserCommandType {
-
-			if command.UserOperation == "add" {
-				if command.UserSshPubKeys != nil {
-					var (
-						authorizedKeysFile *os.File
-						err                error
-						userHome           []byte
-					)
-
-					cmdCtxLogger.Info().Msg("adding SSH Keys")
-
-					localCMD := exec.Command(fmt.Sprintf("grep \"%s\" /etc/passwd | cut -d: -f6", command.Username))
-					userHome, err = localCMD.CombinedOutput()
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error finding user home from /etc/passwd: %v", err)
-					}
-
-					command.UserHome = strings.TrimSpace(string(userHome))
-					userSshDir := fmt.Sprintf("%s/.ssh", command.UserHome)
-
-					if _, err := os.Stat(userSshDir); os.IsNotExist(err) {
-						err := os.MkdirAll(userSshDir, 0700)
-						if err != nil {
-							return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating directory %s %v", userSshDir, err)
-						}
-					}
-
-					if _, err := os.Stat(fmt.Sprintf("%s/authorized_keys", userSshDir)); os.IsNotExist(err) {
-						_, err := os.Create(fmt.Sprintf("%s/authorized_keys", userSshDir))
-						if err != nil {
-							return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating file %s/authorized_keys: %v", userSshDir, err)
-						}
-					}
-
-					authorizedKeysFile, err = os.OpenFile(fmt.Sprintf("%s/authorized_keys", userSshDir), 0700, os.ModeAppend)
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error opening file %s/authorized_keys: %v", userSshDir, err)
-					}
-					defer authorizedKeysFile.Close()
-					for _, k := range command.UserSshPubKeys {
-						buf := bytes.NewBufferString(k)
-						cmdCtxLogger.Info().Str("key", k).Msg("adding SSH key")
-						if _, err := authorizedKeysFile.ReadFrom(buf); err != nil {
-							return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error adding to authorized keys: %v", err)
-						}
-					}
-					localCMD = exec.Command(fmt.Sprintf("chown -R %s:%s %s", command.Username, command.Username, userHome))
-					_, err = localCMD.CombinedOutput()
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), err
-					}
-
-				}
-			}
-		}
 	}
 	return outputArr, nil
 }

-func cmdListWorker(msgTemps *msgTemplates, jobs <-chan *CmdList, results chan<- string, opts *ConfigOpts) {
+func cmdListWorker(msgTemps *msgTemplates, jobs <-chan *CmdList, results chan<- CmdResult, opts *ConfigOpts) {
 	for list := range jobs {
 		fieldsMap := map[string]interface{}{"list": list.Name}
 		var cmdLogger zerolog.Logger
-		var commandExecuted *Command
 		var cmdsRan []string
 		var outStructArr []outStruct
 		var hasError bool // Tracks if any command in the list failed

 		for _, cmd := range list.Order {
 			cmdToRun := opts.Cmds[cmd]
-			commandExecuted = cmdToRun
 			currentCmd := cmdToRun.Name
 			fieldsMap["cmd"] = currentCmd
 			cmdLogger = cmdToRun.GenerateLogger(opts)
@ -290,21 +169,23 @@ func cmdListWorker(msgTemps *msgTemplates, jobs <-chan *CmdList, results chan<-

 			if runErr != nil {

+				// Log the error and send a failed result
 				cmdLogger.Err(runErr).Send()
+				results <- CmdResult{CmdName: cmd, ListName: list.Name, Error: runErr}

+				// Execute error hooks for the failed command
 				cmdToRun.ExecuteHooks("error", opts)

 				// Notify failure
 				if list.NotifyConfig != nil {
 					notifyError(cmdLogger, msgTemps, list, cmdsRan, outStructArr, runErr, cmdToRun)
 				}
-
-				// Execute error hooks for the failed command
 				hasError = true
 				break
 			}

-			if list.GetCommandOutputInNotificationsOnSuccess || cmdToRun.Output.InList {
+			// Collect output if required
+			if list.GetOutput || cmdToRun.GetOutput {
 				outStructArr = append(outStructArr, outStruct{
 					CmdName:     currentCmd,
 					CmdExecuted: currentCmd,
@ -313,20 +194,44 @@ func cmdListWorker(msgTemps *msgTemplates, jobs <-chan *CmdList, results chan<-
 			}
 		}

-		if !hasError && list.NotifyConfig != nil && list.Notify.OnFailure {
+		// Notify success if no errors occurred
+		if !hasError && list.NotifyConfig != nil && (list.NotifyOnSuccess || list.GetOutput) {
 			notifySuccess(cmdLogger, msgTemps, list, cmdsRan, outStructArr)
 		}

-		if !hasError {
-			commandExecuted.ExecuteHooks("success", opts)
+		// Execute success and final hooks for all commands
+		for _, cmd := range list.Order {
+			cmdToRun := opts.Cmds[cmd]
+
+			// Execute success hooks if the command succeeded
+			if !hasError || cmdsRanContains(cmd, cmdsRan) {
+				cmdToRun.ExecuteHooks("success", opts)
+			}
+
+			// Execute final hooks for every command
+			cmdToRun.ExecuteHooks("final", opts)
 		}

-		commandExecuted.ExecuteHooks("final", opts)
-
-		results <- "done"
+		// Send the final result for the list
+		if hasError {
+			results <- CmdResult{CmdName: cmdsRan[len(cmdsRan)-1], ListName: list.Name, Error: fmt.Errorf("list execution failed")}
+		} else {
+			results <- CmdResult{CmdName: cmdsRan[len(cmdsRan)-1], ListName: list.Name, Error: nil}
+		}
 	}
 }

+// Helper to check if a command is in the list of executed commands
+func cmdsRanContains(cmd string, cmdsRan []string) bool {
+	for _, c := range cmdsRan {
+		if c == cmd {
+			return true
+		}
+	}
+	return false
+}
+
+// Helper to notify errors
 func notifyError(logger zerolog.Logger, templates *msgTemplates, list *CmdList, cmdsRan []string, outStructArr []outStruct, err error, cmd *Command) {
 	errStruct := map[string]interface{}{
 		"listName":  list.Name,
@ -372,7 +277,7 @@ func (opts *ConfigOpts) RunListConfig(cron string) {
 	}
 	configListsLen := len(opts.CmdConfigLists)
 	listChan := make(chan *CmdList, configListsLen)
-	results := make(chan string, configListsLen)
+	results := make(chan CmdResult, configListsLen)

 	// Start workers
 	for w := 1; w <= configListsLen; w++ {
@ -392,7 +297,10 @@ func (opts *ConfigOpts) RunListConfig(cron string) {

 	// Process results
 	for a := 1; a <= configListsLen; a++ {
-		<-results
+		result := <-results
+		opts.Logger.Debug().Msgf("Processing result for list %s, command %s", result.ListName, result.CmdName)
+
+		// Process final hooks for the list (already handled in worker)
 	}
 	opts.closeHostConnections()
 }
@ -404,8 +312,10 @@ func (opts *ConfigOpts) ExecuteCmds() {
 		_, runErr := cmdToRun.RunCmd(cmdLogger, opts)
 		if runErr != nil {
 			opts.Logger.Err(runErr).Send()
+
 			cmdToRun.ExecuteHooks("error", opts)
 		} else {
+
 			cmdToRun.ExecuteHooks("success", opts)
 		}

@ -413,6 +323,7 @@ func (opts *ConfigOpts) ExecuteCmds() {
 	}

 	opts.closeHostConnections()
+
 }

 func (c *ConfigOpts) closeHostConnections() {
@ -460,31 +371,26 @@ func (cmd *Command) ExecuteHooks(hookType string, opts *ConfigOpts) {
 		for _, v := range cmd.Hooks.Error {
 			errCmd := opts.Cmds[v]
 			cmdLogger := opts.Logger.With().
-				Str("backy-cmd", v).Str("hookType", "error").
+				Str("backy-cmd", v).
 				Logger()
-			cmdLogger.Info().Msgf("Running error hook command %s", v)
-			// URGENT: Never returns
-			_, _ = errCmd.RunCmd(cmdLogger, opts)
-			return
+			errCmd.RunCmd(cmdLogger, opts)
 		}

 	case "success":
 		for _, v := range cmd.Hooks.Success {
 			successCmd := opts.Cmds[v]
 			cmdLogger := opts.Logger.With().
-				Str("backy-cmd", v).Str("hookType", "success").
+				Str("backy-cmd", v).
 				Logger()
-			cmdLogger.Info().Msgf("Running success hook command %s", v)
-			_, _ = successCmd.RunCmd(cmdLogger, opts)
+			successCmd.RunCmd(cmdLogger, opts)
 		}
 	case "final":
 		for _, v := range cmd.Hooks.Final {
 			finalCmd := opts.Cmds[v]
 			cmdLogger := opts.Logger.With().
-				Str("backy-cmd", v).Str("hookType", "final").
+				Str("backy-cmd", v).
 				Logger()
-			cmdLogger.Info().Msgf("Running final hook command %s", v)
-			_, _ = finalCmd.RunCmd(cmdLogger, opts)
+			finalCmd.RunCmd(cmdLogger, opts)
 		}
 	}
 }
@ -494,59 +400,32 @@ func (cmd *Command) GenerateLogger(opts *ConfigOpts) zerolog.Logger {
 		Str("Backy-cmd", cmd.Name).Str("Host", "local machine").
 		Logger()

-	if !IsHostLocal(cmd.Host) {
+	if cmd.Host != nil {
 		cmdLogger = opts.Logger.With().
-			Str("Backy-cmd", cmd.Name).Str("Host", cmd.Host).
+			Str("Backy-cmd", cmd.Name).Str("Host", *cmd.Host).
 			Logger()
+
 	}
 	return cmdLogger
 }

-func (opts *ConfigOpts) ExecCmdsOnHosts(cmdList []string, hostsList []string) {
+func (opts *ConfigOpts) ExecCmdsSSH(cmdList []string, hostsList []string) {
 	// Iterate over hosts and exec commands
 	for _, h := range hostsList {
 		host := opts.Hosts[h]
 		for _, c := range cmdList {
 			cmd := opts.Cmds[c]
 			cmd.RemoteHost = host
-			cmd.Host = h
-			if IsHostLocal(h) {
-				_, err := cmd.RunCmd(cmd.GenerateLogger(opts), opts)
-				if err != nil {
-					opts.Logger.Err(err).Str("host", h).Str("cmd", c).Send()
-				}
-			} else {
-
-				cmd.Host = host.Host
-				opts.Logger.Info().Str("host", h).Str("cmd", c).Send()
-				_, err := cmd.RunCmdOnHost(cmd.GenerateLogger(opts), opts)
-				if err != nil {
-					opts.Logger.Err(err).Str("host", h).Str("cmd", c).Send()
-				}
+			cmd.Host = &host.Host
+			opts.Logger.Info().Str("host", h).Str("cmd", c).Send()
+			_, err := cmd.RunCmdSSH(cmd.GenerateLogger(opts), opts)
+			if err != nil {
+				opts.Logger.Err(err).Str("host", h).Str("cmd", c).Send()
 			}
 		}
 	}
 }

-func logCommandOutput(command *Command, cmdOutBuf bytes.Buffer, cmdCtxLogger zerolog.Logger, outputArr []string) []string {
-
-	outScanner := bufio.NewScanner(&cmdOutBuf)
-
-	for outScanner.Scan() {
-		outMap := make(map[string]interface{})
-		outMap["cmd"] = command.Name
-		outMap["output"] = outScanner.Text()
-
-		if str, ok := outMap["output"].(string); ok {
-			outputArr = append(outputArr, str)
-		}
-		if command.Output.ToLog {
-			cmdCtxLogger.Info().Fields(outMap).Send()
-		}
-	}
-	return outputArr
-}
-
 // func executeUserCommands() []string {

 // }
--- a/pkg/backy/backy_test.go
+++ b/pkg/backy/backy_test.go
@ -1,83 +0,0 @@
-package backy
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"log"
-	"testing"
-
-	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman"
-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-
-	"github.com/testcontainers/testcontainers-go"
-)
-
-// TestConfigOptions tests the configuration options for the backy package.
-func Test_ErrorHook(t *testing.T) {
-
-	configFile := "../../tests/ErrorHook.yml"
-	logFile := "ErrorHook.log"
-	backyConfigOptions := NewConfigOptions(configFile, SetLogFile(logFile))
-	backyConfigOptions.InitConfig()
-	backyConfigOptions.ParseConfigurationFile()
-	backyConfigOptions.RunListConfig("")
-
-}
-
-func TestSettingCommandInfoPackageCommandDnf(t *testing.T) {
-
-	packagecommand := &Command{
-		Type:             PackageCommandType,
-		PackageManager:   "dnf",
-		Shell:            "zsh",
-		PackageOperation: PackageOperationCheckVersion,
-		Packages:         []packagemanagercommon.Package{{Name: "docker-ce"}},
-	}
-	dnfPackage, _ := pkgman.PackageManagerFactory("dnf", pkgman.WithoutAuth())
-
-	packagecommand.pkgMan = dnfPackage
-	PackageCommand := getCommandTypeAndSetCommandInfo(packagecommand)
-
-	assert.Equal(t, "dnf", PackageCommand.Cmd)
-
-}
-
-func TestWithDockerFile(t *testing.T) {
-	ctx := context.Background()
-
-	docker, err := testcontainers.Run(ctx, "",
-		testcontainers.WithDockerfile(testcontainers.FromDockerfile{
-			Context:    "../../tests/docker",
-			Dockerfile: "Dockerfile",
-			KeepImage:  false,
-			// BuildOptionsModifier: func(buildOptions *types.ImageBuildOptions) {
-			// 	buildOptions.Target = "target2"
-			// },
-		}),
-	)
-	// docker.
-
-	if err != nil {
-		log.Printf("failed to start container: %v", err)
-		return
-	}
-
-	r, err := docker.Logs(ctx)
-	if err != nil {
-		log.Printf("failed to get logs: %v", err)
-		return
-	}
-
-	logs, err := io.ReadAll(r)
-	if err != nil {
-		log.Printf("failed to read logs: %v", err)
-		return
-	}
-
-	fmt.Println(string(logs))
-
-	require.NoError(t, err)
-}
--- a/pkg/backy/commandtype_enumer.go
+++ b/pkg/backy/commandtype_enumer.go
@ -1,141 +0,0 @@
-// Code generated by "enumer -linecomment -yaml -text -json -type=CommandType"; DO NOT EDIT.
-
-package backy
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-const _CommandTypeName = "scriptscriptFileremoteScriptpackageuser"
-
-var _CommandTypeIndex = [...]uint8{0, 0, 6, 16, 28, 35, 39}
-
-const _CommandTypeLowerName = "scriptscriptfileremotescriptpackageuser"
-
-func (i CommandType) String() string {
-	if i < 0 || i >= CommandType(len(_CommandTypeIndex)-1) {
-		return fmt.Sprintf("CommandType(%d)", i)
-	}
-	return _CommandTypeName[_CommandTypeIndex[i]:_CommandTypeIndex[i+1]]
-}
-
-// An "invalid array index" compiler error signifies that the constant values have changed.
-// Re-run the stringer command to generate them again.
-func _CommandTypeNoOp() {
-	var x [1]struct{}
-	_ = x[DefaultCommandType-(0)]
-	_ = x[ScriptCommandType-(1)]
-	_ = x[ScriptFileCommandType-(2)]
-	_ = x[RemoteScriptCommandType-(3)]
-	_ = x[PackageCommandType-(4)]
-	_ = x[UserCommandType-(5)]
-}
-
-var _CommandTypeValues = []CommandType{DefaultCommandType, ScriptCommandType, ScriptFileCommandType, RemoteScriptCommandType, PackageCommandType, UserCommandType}
-
-var _CommandTypeNameToValueMap = map[string]CommandType{
-	_CommandTypeName[0:0]:        DefaultCommandType,
-	_CommandTypeLowerName[0:0]:   DefaultCommandType,
-	_CommandTypeName[0:6]:        ScriptCommandType,
-	_CommandTypeLowerName[0:6]:   ScriptCommandType,
-	_CommandTypeName[6:16]:       ScriptFileCommandType,
-	_CommandTypeLowerName[6:16]:  ScriptFileCommandType,
-	_CommandTypeName[16:28]:      RemoteScriptCommandType,
-	_CommandTypeLowerName[16:28]: RemoteScriptCommandType,
-	_CommandTypeName[28:35]:      PackageCommandType,
-	_CommandTypeLowerName[28:35]: PackageCommandType,
-	_CommandTypeName[35:39]:      UserCommandType,
-	_CommandTypeLowerName[35:39]: UserCommandType,
-}
-
-var _CommandTypeNames = []string{
-	_CommandTypeName[0:0],
-	_CommandTypeName[0:6],
-	_CommandTypeName[6:16],
-	_CommandTypeName[16:28],
-	_CommandTypeName[28:35],
-	_CommandTypeName[35:39],
-}
-
-// CommandTypeString retrieves an enum value from the enum constants string name.
-// Throws an error if the param is not part of the enum.
-func CommandTypeString(s string) (CommandType, error) {
-	if val, ok := _CommandTypeNameToValueMap[s]; ok {
-		return val, nil
-	}
-
-	if val, ok := _CommandTypeNameToValueMap[strings.ToLower(s)]; ok {
-		return val, nil
-	}
-	return 0, fmt.Errorf("%s does not belong to CommandType values", s)
-}
-
-// CommandTypeValues returns all values of the enum
-func CommandTypeValues() []CommandType {
-	return _CommandTypeValues
-}
-
-// CommandTypeStrings returns a slice of all String values of the enum
-func CommandTypeStrings() []string {
-	strs := make([]string, len(_CommandTypeNames))
-	copy(strs, _CommandTypeNames)
-	return strs
-}
-
-// IsACommandType returns "true" if the value is listed in the enum definition. "false" otherwise
-func (i CommandType) IsACommandType() bool {
-	for _, v := range _CommandTypeValues {
-		if i == v {
-			return true
-		}
-	}
-	return false
-}
-
-// MarshalJSON implements the json.Marshaler interface for CommandType
-func (i CommandType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.String())
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface for CommandType
-func (i *CommandType) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return fmt.Errorf("CommandType should be a string, got %s", data)
-	}
-
-	var err error
-	*i, err = CommandTypeString(s)
-	return err
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for CommandType
-func (i CommandType) MarshalText() ([]byte, error) {
-	return []byte(i.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for CommandType
-func (i *CommandType) UnmarshalText(text []byte) error {
-	var err error
-	*i, err = CommandTypeString(string(text))
-	return err
-}
-
-// MarshalYAML implements a YAML Marshaler for CommandType
-func (i CommandType) MarshalYAML() (interface{}, error) {
-	return i.String(), nil
-}
-
-// UnmarshalYAML implements a YAML Unmarshaler for CommandType
-func (i *CommandType) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-
-	var err error
-	*i, err = CommandTypeString(s)
-	return err
-}
--- a/pkg/backy/config.go
+++ b/pkg/backy/config.go
@ -1,6 +1,7 @@
 package backy

 import (
+	"context"
 	"errors"
 	"fmt"
 	"net/url"
@ -21,13 +22,10 @@ import (
 	"github.com/rs/zerolog"
 )

-const (
-	externDirectiveStart      string = "%{"
-	externDirectiveEnd        string = "}%"
-	externFileDirectiveStart  string = "%{file:"
-	envExternDirectiveStart   string = "%{env:"
-	vaultExternDirectiveStart string = "%{vault:"
-)
+const macroStart string = "%{"
+const macroEnd string = "}%"
+const envMacroStart string = "%{env:"
+const vaultMacroStart string = "%{vault:"

 func (opts *ConfigOpts) InitConfig() {
 	var err error
@ -55,7 +53,7 @@ func (opts *ConfigOpts) InitConfig() {
 	cacheDir := homeCacheDir

 	// Load metadata from file
-	opts.CachedData, err = remotefetcher.LoadMetadataFromFile(path.Join(backyHomeConfDir, "cache", "cache.yml"))
+	opts.CachedData, err = remotefetcher.LoadMetadataFromFile(path.Join(backyHomeConfDir, "cache.yml"))
 	if err != nil {
 		fmt.Println("Error loading metadata:", err)
 		logging.ExitWithMSG(err.Error(), 1, &opts.Logger)
@ -79,13 +77,11 @@ func (opts *ConfigOpts) InitConfig() {
 	if err != nil {
 		logging.ExitWithMSG(fmt.Sprintf("error initializing cache: %v", err), 1, nil)
 	}
-
-	if isRemoteURL(opts.ConfigFilePath) {
-		p, _ := getRemoteDir(opts.ConfigFilePath)
-		opts.ConfigDir = p
-	}
-
+	// Initialize the fetcher
+	// println("Creating new fetcher for source", opts.ConfigFilePath)
 	fetcher, err := remotefetcher.NewRemoteFetcher(opts.ConfigFilePath, opts.Cache)
+	// println("Created new fetcher for source", opts.ConfigFilePath)
+
 	if err != nil {
 		logging.ExitWithMSG(fmt.Sprintf("error initializing config fetcher: %v", err), 1, nil)
 	}
@ -99,67 +95,68 @@ func (opts *ConfigOpts) InitConfig() {
 	opts.koanf = backyKoanf
 }

-func (opts *ConfigOpts) ParseConfigurationFile() *ConfigOpts {
+func loadConfigFile(fetcher remotefetcher.RemoteFetcher, filePath string, k *koanf.Koanf, opts *ConfigOpts) {
+	data, err := fetcher.Fetch(filePath)
+	if err != nil {
+		logging.ExitWithMSG(fmt.Sprintf("Could not fetch config file %s: %v", filePath, err), 1, nil)
+	}
+
+	if err := k.Load(rawbytes.Provider(data), yaml.Parser()); err != nil {
+		logging.ExitWithMSG(fmt.Sprintf("error loading config: %v", err), 1, &opts.Logger)
+	}
+}
+
+func loadDefaultConfigFiles(fetcher remotefetcher.RemoteFetcher, configFiles []string, k *koanf.Koanf, opts *ConfigOpts) {
+	cFileFailures := 0
+	for _, c := range configFiles {
+		data, err := fetcher.Fetch(c)
+		if err != nil {
+			cFileFailures++
+			continue
+		}
+
+		if err := k.Load(rawbytes.Provider(data), yaml.Parser()); err != nil {
+			cFileFailures++
+			continue
+		}
+
+		break
+	}
+
+	if cFileFailures == len(configFiles) {
+		logging.ExitWithMSG("Could not find any valid config file", 1, nil)
+	}
+}
+
+func (opts *ConfigOpts) ReadConfig() *ConfigOpts {
 	setTerminalEnv()

 	backyKoanf := opts.koanf

-	if backyKoanf.Exists("variables") {
-		unmarshalConfigIntoStruct(backyKoanf, "variables", &opts.Vars, opts.Logger)
-	}
-
-	getConfigDir(opts)
-
 	opts.loadEnv()

 	if backyKoanf.Bool(getNestedConfig("logging", "cmd-std-out")) {
-		os.Setenv("BACKY_CMDSTDOUT", "enabled")
-	}
-
-	// override the default value of cmd-std-out if flag is set
-	if opts.CmdStdOut {
-		os.Setenv("BACKY_CMDSTDOUT", "enabled")
+		os.Setenv("BACKY_STDOUT", "enabled")
 	}

 	CheckConfigValues(backyKoanf, opts.ConfigFilePath)

-	validateExecCommandsFromCLI(backyKoanf, opts)
+	validateCommands(backyKoanf, opts)

 	setLoggingOptions(backyKoanf, opts)

 	log := setupLogger(opts)
 	opts.Logger = log

-	hostsFetcher, err := remotefetcher.NewRemoteFetcher(opts.HostsFilePath, opts.Cache)
-	opts.Logger.Info().Str("hosts file", opts.HostsFilePath).Send()
-	if err != nil {
-		logging.ExitWithMSG(fmt.Sprintf("error initializing config fetcher: %v", err), 1, nil)
-	}
-
-	var hostKoanf = koanf.New(".")
-	if opts.HostsFilePath != "" {
-		loadConfigFile(hostsFetcher, opts.HostsFilePath, hostKoanf, opts)
-		unmarshalConfigIntoStruct(hostKoanf, "hosts", &opts.Hosts, opts.Logger)
-	} else {
-		unmarshalConfigIntoStruct(backyKoanf, "hosts", &opts.Hosts, opts.Logger)
-	}
-
 	log.Info().Str("config file", opts.ConfigFilePath).Send()

-	if err := opts.initializeVault(); err != nil {
-		log.Err(err).Send()
-	}
+	unmarshalConfig(backyKoanf, "commands", &opts.Cmds, opts.Logger)

-	unmarshalConfigIntoStruct(backyKoanf, "commands", &opts.Cmds, opts.Logger)
+	validateCommandEnvironments(opts)

-	getCommandEnvironments(opts)
+	unmarshalConfig(backyKoanf, "hosts", &opts.Hosts, opts.Logger)

-	getHostConfigs(opts)
-
-	for k, v := range opts.Vars {
-		v = getExternalConfigDirectiveValue(v, opts, AllowedExternalDirectiveAll)
-		opts.Vars[k] = v
-	}
+	resolveHostConfigs(opts)

 	loadCommandLists(opts, backyKoanf)

@ -176,49 +173,18 @@ func (opts *ConfigOpts) ParseConfigurationFile() *ConfigOpts {
 	filterExecuteLists(opts)

 	if backyKoanf.Exists("notifications") {
-		unmarshalConfigIntoStruct(backyKoanf, "notifications", &opts.NotificationConf, opts.Logger)
+		unmarshalConfig(backyKoanf, "notifications", &opts.NotificationConf, opts.Logger)
 	}

 	opts.SetupNotify()

+	if err := opts.setupVault(); err != nil {
+		log.Err(err).Send()
+	}
+
 	return opts
 }

-func loadConfigFile(fetcher remotefetcher.RemoteFetcher, filePath string, koanfConfigParser *koanf.Koanf, opts *ConfigOpts) {
-	data, err := fetcher.Fetch(filePath)
-	if err != nil {
-		logging.ExitWithMSG(generateFileFetchErrorString(filePath, "config", err), 1, nil)
-	}
-
-	if err := koanfConfigParser.Load(rawbytes.Provider(data), yaml.Parser()); err != nil {
-		logging.ExitWithMSG(fmt.Sprintf("error loading config: %v", err), 1, &opts.Logger)
-	}
-}
-
-func loadDefaultConfigFiles(fetcher remotefetcher.RemoteFetcher, configFiles []string, k *koanf.Koanf, opts *ConfigOpts) {
-	cFileFailures := 0
-	for _, c := range configFiles {
-		opts.ConfigFilePath = c
-		data, err := fetcher.Fetch(c)
-		if err != nil {
-			cFileFailures++
-			continue
-		}
-
-		if data != nil {
-			if err := k.Load(rawbytes.Provider(data), yaml.Parser()); err == nil {
-				break
-			} else {
-				logging.ExitWithMSG(fmt.Sprintf("error loading config from file %s: %v", c, err), 1, &opts.Logger)
-			}
-		}
-	}
-
-	if cFileFailures == len(configFiles) {
-		logging.ExitWithMSG("Could not find any valid local config file", 1, nil)
-	}
-}
-
 func setTerminalEnv() {
 	if isatty.IsTerminal(os.Stdout.Fd()) || isatty.IsCygwinTerminal(os.Stdout.Fd()) {
 		os.Setenv("BACKY_TERM", "enabled")
@ -227,7 +193,7 @@ func setTerminalEnv() {
 	}
 }

-func validateExecCommandsFromCLI(k *koanf.Koanf, opts *ConfigOpts) {
+func validateCommands(k *koanf.Koanf, opts *ConfigOpts) {
 	for _, c := range opts.executeCmds {
 		if !k.Exists(getCmdFromConfig(c)) {
 			logging.ExitWithMSG(fmt.Sprintf("command %s is not in config file %s", c, opts.ConfigFilePath), 1, nil)
@ -235,23 +201,23 @@ func validateExecCommandsFromCLI(k *koanf.Koanf, opts *ConfigOpts) {
 	}
 }

-func setLoggingOptions(backyKoanf *koanf.Koanf, opts *ConfigOpts) {
-	isVerboseLoggingSetInConfig := backyKoanf.Bool(getLoggingKeyFromConfig("verbose"))
+func setLoggingOptions(k *koanf.Koanf, opts *ConfigOpts) {
+	isLoggingVerbose := k.Bool(getLoggingKeyFromConfig("verbose"))

 	// if log file is set in config file and not set on command line, use "./backy.log"
 	logFile := "./backy.log"
-	if opts.LogFilePath == "" && backyKoanf.Exists(getLoggingKeyFromConfig("file")) {
-		logFile = backyKoanf.String(getLoggingKeyFromConfig("file"))
+	if opts.LogFilePath == "" && k.Exists(getLoggingKeyFromConfig("file")) {
+		logFile = k.String(getLoggingKeyFromConfig("file"))
 		opts.LogFilePath = logFile
 	}

 	zerolog.SetGlobalLevel(zerolog.InfoLevel)
-	if isVerboseLoggingSetInConfig {
+	if isLoggingVerbose {
 		zerolog.SetGlobalLevel(zerolog.DebugLevel)
 		os.Setenv("BACKY_LOGLEVEL", fmt.Sprintf("%v", zerolog.GlobalLevel()))
 	}

-	if backyKoanf.Bool(getLoggingKeyFromConfig("console-disabled")) {
+	if k.Bool(getLoggingKeyFromConfig("console-disabled")) {
 		os.Setenv("BACKY_CONSOLE_LOGGING", "")
 	} else {
 		os.Setenv("BACKY_CONSOLE_LOGGING", "enabled")
@ -263,37 +229,34 @@ func setupLogger(opts *ConfigOpts) zerolog.Logger {
 	return zerolog.New(writers).With().Timestamp().Logger()
 }

-func unmarshalConfigIntoStruct(k *koanf.Koanf, key string, target interface{}, log zerolog.Logger) {
+func unmarshalConfig(k *koanf.Koanf, key string, target interface{}, log zerolog.Logger) {
 	if err := k.UnmarshalWithConf(key, target, koanf.UnmarshalConf{Tag: "yaml"}); err != nil {
-		logging.ExitWithMSG(fmt.Sprintf("error unmarshaling key %s into struct: %v", key, err), 1, &log)
+		logging.ExitWithMSG(fmt.Sprintf("error unmarshalling %s struct: %v", key, err), 1, &log)
 	}
 }

-func getCommandEnvironments(opts *ConfigOpts) {
+func validateCommandEnvironments(opts *ConfigOpts) {
 	for cmdName, cmdConf := range opts.Cmds {
-		if cmdConf.Env == "" {
-			continue
-		}
-		opts.Logger.Debug().Str("env file", cmdConf.Env).Str("cmd", cmdName).Send()
 		if err := testFile(cmdConf.Env); err != nil {
-			logging.ExitWithMSG("Could not open file"+cmdConf.Env+": "+err.Error(), 1, &opts.Logger)
+			opts.Logger.Info().Str("cmd", cmdName).Err(err).Send()
+			os.Exit(1)
 		}
 		expandEnvVars(opts.backyEnv, cmdConf.Environment)
 	}
 }

-func getHostConfigs(opts *ConfigOpts) {
+func resolveHostConfigs(opts *ConfigOpts) {
 	for hostConfigName, host := range opts.Hosts {
 		if host.Host == "" {
 			host.Host = hostConfigName
 		}
 		if host.ProxyJump != "" {
-			getProxyHosts(host, opts)
+			resolveProxyHosts(host, opts)
 		}
 	}
 }

-func getProxyHosts(host *Host, opts *ConfigOpts) {
+func resolveProxyHosts(host *Host, opts *ConfigOpts) {
 	proxyHosts := strings.Split(host.ProxyJump, ",")
 	for _, h := range proxyHosts {
 		proxyHost, defined := opts.Hosts[h]
@ -305,47 +268,34 @@ func getProxyHosts(host *Host, opts *ConfigOpts) {
 	}
 }

-func getConfigDir(opts *ConfigOpts) {
-	if isRemoteURL(opts.ConfigFilePath) {
-		p, _ := getRemoteDir(opts.ConfigFilePath)
-		opts.ConfigDir = p
-	} else {
-		opts.ConfigDir = path.Dir(opts.ConfigFilePath)
-	}
-}
-
 func loadCommandLists(opts *ConfigOpts, backyKoanf *koanf.Koanf) {
+	var backyConfigFileDir string
 	var listConfigFiles []string
 	var u *url.URL
-	var p string
+	// if config file is remote, use the directory of the remote file
 	if isRemoteURL(opts.ConfigFilePath) {
-		p, u = getRemoteDir(opts.ConfigFilePath)
-		opts.ConfigDir = p
+		_, u = getRemoteDir(opts.ConfigFilePath)
 		listConfigFiles = []string{u.JoinPath("lists.yml").String(), u.JoinPath("lists.yaml").String()}
 	} else {
-		opts.ConfigDir = path.Dir(opts.ConfigFilePath)
+		backyConfigFileDir = path.Dir(opts.ConfigFilePath)
 		listConfigFiles = []string{
-			// "./lists.yml", "./lists.yaml",
-			path.Join(opts.ConfigDir, "lists.yml"),
-			path.Join(opts.ConfigDir, "lists.yaml"),
+			path.Join(backyConfigFileDir, "lists.yml"),
+			path.Join(backyConfigFileDir, "lists.yaml"),
 		}
 	}

 	listsConfig := koanf.New(".")

-	if backyKoanf.Exists("cmdLists") {
-		if backyKoanf.Exists("cmdLists.file") {
-			loadCmdListsFile(backyKoanf, listsConfig, opts)
-		} else {
-			unmarshalConfigIntoStruct(backyKoanf, "cmdLists", &opts.CmdConfigLists, opts.Logger)
+	for _, l := range listConfigFiles {
+		if loadListConfigFile(l, listsConfig, opts) {
+			break
 		}
 	}

-	if opts.CmdConfigLists == nil {
-		for _, l := range listConfigFiles {
-			if loadListConfigFile(l, listsConfig, opts) {
-				break
-			}
+	if backyKoanf.Exists("cmd-lists") {
+		unmarshalConfig(backyKoanf, "cmd-lists", &opts.CmdConfigLists, opts.Logger)
+		if backyKoanf.Exists("cmd-lists.file") {
+			loadCmdListsFile(backyKoanf, listsConfig, opts)
 		}
 	}
 }
@ -385,16 +335,13 @@ func loadListConfigFile(filePath string, k *koanf.Koanf, opts *ConfigOpts) bool
 		return false
 	}

-	unmarshalConfigIntoStruct(k, "cmdLists", &opts.CmdConfigLists, opts.Logger)
-	keyNotSupported("cmd-lists", "cmdLists", k, opts, true)
 	opts.CmdListFile = filePath
 	return true
 }

 func loadCmdListsFile(backyKoanf *koanf.Koanf, listsConfig *koanf.Koanf, opts *ConfigOpts) {
-	opts.CmdListFile = strings.TrimSpace(backyKoanf.String("cmdLists.file"))
+	opts.CmdListFile = strings.TrimSpace(backyKoanf.String("cmd-lists.file"))
 	if !path.IsAbs(opts.CmdListFile) {
-		// TODO: Needs testing - might cause undefined/unexpected behavior if remote config path is used
 		opts.CmdListFile = path.Join(path.Dir(opts.ConfigFilePath), opts.CmdListFile)
 	}

@ -406,28 +353,21 @@ func loadCmdListsFile(backyKoanf *koanf.Koanf, listsConfig *koanf.Koanf, opts *C

 	data, err := fetcher.Fetch(opts.CmdListFile)
 	if err != nil {
-		logging.ExitWithMSG(generateFileFetchErrorString(opts.CmdListFile, "list config", err), 1, nil)
+		logging.ExitWithMSG(fmt.Sprintf("Could not fetch config file %s: %v", opts.CmdListFile, err), 1, nil)
 	}

 	if err := listsConfig.Load(rawbytes.Provider(data), yaml.Parser()); err != nil {
 		logging.ExitWithMSG(fmt.Sprintf("error loading config: %v", err), 1, &opts.Logger)
 	}

-	keyNotSupported("cmd-lists", "cmdLists", listsConfig, opts, true)
-	unmarshalConfigIntoStruct(listsConfig, "cmdLists", &opts.CmdConfigLists, opts.Logger)
+	unmarshalConfig(listsConfig, "cmd-lists", &opts.CmdConfigLists, opts.Logger)
 	opts.Logger.Info().Str("using lists config file", opts.CmdListFile).Send()
 }

-func generateFileFetchErrorString(file, fileType string, err error) string {
-	return fmt.Sprintf("Could not fetch %s file %s: %v", file, fileType, err)
-}
-
 func validateCommandLists(opts *ConfigOpts) {
 	var cmdNotFoundSliceErr []error
 	for cmdListName, cmdList := range opts.CmdConfigLists {
-		// if cron is enabled and cron is not set, delete the list
 		if opts.cronEnabled && strings.TrimSpace(cmdList.Cron) == "" {
-			opts.Logger.Debug().Str("cron", "enabled").Str("list", cmdListName).Msg("cron not set, deleting list")
 			delete(opts.CmdConfigLists, cmdListName)
 			continue
 		}
@ -467,11 +407,11 @@ func getLoggingKeyFromConfig(key string) string {
 	return fmt.Sprintf("logging.%s", key)
 }

-// func getCmdListFromConfig(list string) string {
-// 	return fmt.Sprintf("cmdLists.%s", list)
-// }
+func getCmdListFromConfig(list string) string {
+	return fmt.Sprintf("cmd-lists.%s", list)
+}

-func (opts *ConfigOpts) initializeVault() error {
+func (opts *ConfigOpts) setupVault() error {
 	if !opts.koanf.Bool("vault.enabled") {
 		return nil
 	}
@ -492,41 +432,97 @@ func (opts *ConfigOpts) initializeVault() error {
 		token = os.Getenv("VAULT_TOKEN")
 	}
 	if strings.TrimSpace(token) == "" {
-		return fmt.Errorf("no token found. One is required. \n\nSet the config key vault.token or the environment variable VAULT_TOKEN")
+		return fmt.Errorf("no token found, but one was required. \n\nSet the config key vault.token or the environment variable VAULT_TOKEN")
 	}

 	client.SetToken(token)

 	unmarshalErr := opts.koanf.UnmarshalWithConf("vault.keys", &opts.VaultKeys, koanf.UnmarshalConf{Tag: "yaml"})
 	if unmarshalErr != nil {
-		logging.ExitWithMSG(fmt.Sprintf("error unmarshaling vault.keys into struct: %v", unmarshalErr), 1, &opts.Logger)
+		logging.ExitWithMSG(fmt.Sprintf("error unmarshalling vault.keys into struct: %v", unmarshalErr), 1, &opts.Logger)
 	}

 	opts.vaultClient = client

-	for _, v := range opts.VaultKeys {
-		v.Name = replaceVarInString(opts.Vars, v.Key, opts.Logger)
-		v.MountPath = replaceVarInString(opts.Vars, v.MountPath, opts.Logger)
+	return nil
+}
+
+func getVaultSecret(vaultClient *vault.Client, key *VaultKey) (string, error) {
+	var (
+		secret *vault.KVSecret
+		err    error
+	)
+
+	if key.ValueType == "KVv2" {
+		secret, err = vaultClient.KVv2(key.MountPath).Get(context.Background(), key.Path)
+	} else if key.ValueType == "KVv1" {
+		secret, err = vaultClient.KVv1(key.MountPath).Get(context.Background(), key.Path)
+	} else if key.ValueType != "" {
+		return "", fmt.Errorf("type %s for key %s not known. Valid types are KVv1 or KVv2", key.ValueType, key.Name)
+	} else {
+		return "", fmt.Errorf("type for key %s must be specified. Valid types are KVv1 or KVv2", key.Name)
+
+	}
+	if err != nil {
+		return "", fmt.Errorf("unable to read secret: %v", err)
 	}

-	return nil
+	value, ok := secret.Data[key.Name].(string)
+	if !ok {
+		return "", fmt.Errorf("value type assertion failed: %T %#v", secret.Data[key.Name], secret.Data[key.Name])
+	}
+
+	return value, nil
+}
+
+func isVaultKey(str string) (string, bool) {
+	str = strings.TrimSpace(str)
+	return strings.TrimPrefix(str, "vault:"), strings.HasPrefix(str, "vault:")
+}
+
+func parseVaultKey(str string, keys []*VaultKey) (*VaultKey, error) {
+	keyName, isKey := isVaultKey(str)
+	if !isKey {
+		return nil, nil
+	}
+
+	for _, k := range keys {
+		if k.Name == keyName {
+			return k, nil
+		}
+	}
+	return nil, fmt.Errorf("key %s not found in vault keys", keyName)
+}
+
+func GetVaultKey(str string, opts *ConfigOpts, log zerolog.Logger) string {
+	key, err := parseVaultKey(str, opts.VaultKeys)
+	if key == nil && err == nil {
+		return str
+	}
+	if err != nil && key == nil {
+		log.Err(err).Send()
+		return ""
+	}
+
+	value, secretErr := getVaultSecret(opts.vaultClient, key)
+	if secretErr != nil {
+		log.Err(secretErr).Send()
+		return value
+	}
+	return value
 }

 func processCmds(opts *ConfigOpts) error {

 	// process commands
 	for cmdName, cmd := range opts.Cmds {
-		cmd.GetVariablesFromConf(opts)
-		cmd.Cmd = replaceVarInString(opts.Vars, cmd.Cmd, opts.Logger)
-		for i, v := range cmd.Args {
-			v = replaceVarInString(opts.Vars, v, opts.Logger)
-			cmd.Args[i] = v
-		}
+
 		if cmd.Name == "" {
 			cmd.Name = cmdName
 		}
-
+		// println("Cmd.Name = " + cmd.Name)
 		hooks := cmd.Hooks
+		// resolve hooks
 		if hooks != nil {

 			processHookSuccess := processHooks(cmd, hooks.Error, opts, "error")
@ -543,13 +539,9 @@ func processCmds(opts *ConfigOpts) error {
 			}
 		}

-		if !IsHostLocal(cmd.Host) {
-
-			cmdHost := replaceVarInString(opts.Vars, cmd.Host, opts.Logger)
-			if cmdHost != cmd.Host {
-				cmd.Host = cmdHost
-			}
-			host, hostFound := opts.Hosts[cmd.Host]
+		// resolve hosts
+		if cmd.Host != nil {
+			host, hostFound := opts.Hosts[*cmd.Host]
 			if hostFound {
 				cmd.RemoteHost = host
 				cmd.RemoteHost.Host = host.Host
@ -557,85 +549,55 @@ func processCmds(opts *ConfigOpts) error {
 					cmd.RemoteHost.HostName = host.HostName
 				}
 			} else {
-				opts.Logger.Info().Msgf("adding host %s to host list", cmd.Host)
-				if opts.Hosts == nil {
-					opts.Hosts = make(map[string]*Host)
-				}
-				opts.Hosts[cmd.Host] = &Host{Host: cmd.Host}
-				cmd.RemoteHost = &Host{Host: cmd.Host}
-			}
-		} else {
-
-			if cmd.Dir != nil {
-
-				cmdDir, err := getFullPathWithHomeDir(*cmd.Dir)
-				if err != nil {
-					return err
-				}
-				cmd.Dir = &cmdDir
-			} else {
-				cmd.Dir = &opts.ConfigDir
+				opts.Hosts[*cmd.Host] = &Host{Host: *cmd.Host}
+				cmd.RemoteHost = &Host{Host: *cmd.Host}
 			}
 		}

-		if cmd.Type == PackageCommandType {
+		// Parse package commands
+		if cmd.Type == "package" {
 			if cmd.PackageManager == "" {
-				return fmt.Errorf("package manager is required for package command %s", cmd.Name)
+				return fmt.Errorf("package manager is required for package command %s", cmd.PackageName)
 			}
-			if cmd.PackageOperation.String() == "" {
-				return fmt.Errorf("package operation is required for package command %s", cmd.Name)
+			if cmd.PackageOperation == "" {
+				return fmt.Errorf("package operation is required for package command %s", cmd.PackageName)
 			}
-			if cmd.Packages == nil {
-				return fmt.Errorf("package name is required for package command %s", cmd.Name)
+			if cmd.PackageName == "" {
+				return fmt.Errorf("package name is required for package command %s", cmd.PackageName)
 			}
 			var err error

 			// Validate the operation
-			if cmd.PackageOperation.IsAPackageOperation() {
-
+			switch cmd.PackageOperation {
+			case "install", "remove", "upgrade", "checkVersion":
 				cmd.pkgMan, err = pkgman.PackageManagerFactory(cmd.PackageManager, pkgman.WithoutAuth())
 				if err != nil {
 					return err
 				}
-			} else {
+			default:
 				return fmt.Errorf("unsupported package operation %s for command %s", cmd.PackageOperation, cmd.Name)
 			}
-
 		}

 		// Parse user commands
-		if cmd.Type == UserCommandType {
+		if cmd.Type == "user" {
 			if cmd.Username == "" {
 				return fmt.Errorf("username is required for user command %s", cmd.Name)
 			}
-			cmd.Username = replaceVarInString(opts.Vars, cmd.Username, opts.Logger)
-			err := detectOSType(cmd, opts)
-			if err != nil {
-				opts.Logger.Info().Err(err).Str("command", cmdName).Send()
-			}
+
+			detectOSType(cmd, opts)
+			var err error

 			// Validate the operation
 			switch cmd.UserOperation {
 			case "add", "remove", "modify", "checkIfExists", "delete", "password":
 				cmd.userMan, err = usermanager.NewUserManager(cmd.OS)
-
-				if cmd.UserOperation == "password" {
-					opts.Logger.Debug().Msg("changing password for user: " + cmd.Username)
-					cmd.UserPassword = getExternalConfigDirectiveValue(cmd.UserPassword, opts, AllowedExternalDirectiveAll)
-				}
-
-				if !IsHostLocal(cmd.Host) {
-
-					host, ok := opts.Hosts[cmd.Host]
+				if cmd.Host != nil {
+					host, ok := opts.Hosts[*cmd.Host]
 					if ok {
 						cmd.userMan, err = usermanager.NewUserManager(host.OS)
 					}
 				}
-				for indx, key := range cmd.UserSshPubKeys {
-					opts.Logger.Debug().Msg("adding SSH Keys")
-					key = getExternalConfigDirectiveValue(key, opts, AllowedExternalDirectiveAll)
-					cmd.UserSshPubKeys[indx] = key
-				}
 				if err != nil {
 					return err
 				}
@ -645,30 +607,24 @@ func processCmds(opts *ConfigOpts) error {

 		}

-		if cmd.Type == RemoteScriptCommandType {
-			var fetchErr error
+		if cmd.Type == "remoteScript" {
 			if !isRemoteURL(cmd.Cmd) {
 				return fmt.Errorf("remoteScript command %s must be a remote resource", cmdName)
 			}
-			cmd.Fetcher, fetchErr = remotefetcher.NewRemoteFetcher(cmd.Cmd, opts.Cache, remotefetcher.WithFileType("script"))
-			if fetchErr != nil {
-				return fmt.Errorf("error initializing remote fetcher for remoteScript: %v", fetchErr)
-			}

 		}
-		if cmd.Output.File != "" {
-			var err error
-			cmd.Output.File, err = getFullPathWithHomeDir(cmd.Output.File)
-			if err != nil {
-				return err
-			}
-		}
 	}
 	return nil
 }

+// processHooks evaluates if hooks are valid Commands
+//
+// The cmd.hookRefs[hookType] is created with any hooks found.
+//
+// Returns an error, if any, if the hook command is not found
 func processHooks(cmd *Command, hooks []string, opts *ConfigOpts, hookType string) error {

+	// initialize hook type
 	var hookCmdFound bool
 	cmd.hookRefs = map[string]map[string]*Command{}
 	cmd.hookRefs[hookType] = map[string]*Command{}
@ -695,18 +651,13 @@ func processHooks(cmd *Command, hooks []string, opts *ConfigOpts, hookType strin
 }

 func detectOSType(cmd *Command, opts *ConfigOpts) error {
-
-	if IsHostLocal(cmd.Host) {
-
-		if runtime.GOOS == "linux" {
+	if cmd.Host == nil {
+		if runtime.GOOS == "linux" { // also can be specified to FreeBSD
 			cmd.OS = "linux"
 			opts.Logger.Info().Msg("Unix/Linux type OS detected")
-			return nil
 		}
-		return fmt.Errorf("using an os that is not yet supported for user commands")
 	}
-
-	host, ok := opts.Hosts[cmd.Host]
+	host, ok := opts.Hosts[*cmd.Host]
 	if ok {
 		if host.OS != "" {
 			return nil
@ -727,36 +678,3 @@ func detectOSType(cmd *Command, opts *ConfigOpts) error {
 	}
 	return nil
 }
-
-func keyNotSupported(oldKey, newKey string, koanf *koanf.Koanf, opts *ConfigOpts, deprecated bool) {
-
-	if koanf.Exists(oldKey) {
-		if deprecated {
-			opts.Logger.Warn().Str("key", oldKey).Msg("key is deprecated. Use " + newKey + " instead.")
-		} else {
-			opts.Logger.Fatal().Err(fmt.Errorf("key %s found; it has changed to %s", oldKey, newKey)).Send()
-		}
-	}
-}
-
-func replaceVarInString(vars map[string]string, str string, logger zerolog.Logger) string {
-	if strings.Contains(str, "%{var:") && strings.Contains(str, "}%") {
-		logger.Debug().Msgf("replacing vars in string %s", str)
-		for k, v := range vars {
-			if strings.Contains(str, "%{var:"+k+"}%") {
-				str = strings.ReplaceAll(str, "%{var:"+k+"}%", v)
-			}
-		}
-		if strings.Contains(str, "%{var:") && strings.Contains(str, "}%") {
-			logger.Warn().Msg("could not replace all vars in string")
-		}
-	}
-	return str
-}
-
-func (c *Command) GetVariablesFromConf(opts *ConfigOpts) {
-	c.ScriptEnvFile = replaceVarInString(opts.Vars, c.ScriptEnvFile, opts.Logger)
-	c.Name = replaceVarInString(opts.Vars, c.Name, opts.Logger)
-	c.Output.File = replaceVarInString(opts.Vars, c.Output.File, opts.Logger)
-	c.Host = replaceVarInString(opts.Vars, c.Host, opts.Logger)
-}
--- a/pkg/backy/cron.go
+++ b/pkg/backy/cron.go
@ -17,7 +17,10 @@ func (opts *ConfigOpts) Cron() {
 	s := gocron.NewScheduler(time.Local)
 	s.TagsUnique()
 	cmdLists := opts.CmdConfigLists
-	for _, config := range cmdLists {
+	for listName, config := range cmdLists {
+		if config.Name == "" {
+			config.Name = listName
+		}

 		cron := strings.TrimSpace(config.Cron)
 		if cron != "" {
--- a/pkg/backy/lineinfile.go
+++ b/pkg/backy/lineinfile.go
@ -1,133 +0,0 @@
-package backy
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-)
-
-func sshConnect(user, password, host string, port int) (*ssh.Client, error) {
-	config := &ssh.ClientConfig{
-		User: user,
-		Auth: []ssh.AuthMethod{
-			ssh.Password(password),
-		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-	}
-	addr := fmt.Sprintf("%s:%d", host, port)
-	return ssh.Dial("tcp", addr, config)
-}
-
-func sshReadFile(client *ssh.Client, remotePath string) (string, error) {
-	session, err := client.NewSession()
-	if err != nil {
-		return "", err
-	}
-	defer session.Close()
-
-	var b bytes.Buffer
-	session.Stdout = &b
-	if err := session.Run(fmt.Sprintf("cat %s", remotePath)); err != nil {
-		return "", err
-	}
-	return b.String(), nil
-}
-
-func sshWriteFile(client *ssh.Client, remotePath, content string) error {
-	session, err := client.NewSession()
-	if err != nil {
-		return err
-	}
-	defer session.Close()
-
-	stdin, err := session.StdinPipe()
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		defer stdin.Close()
-		io.WriteString(stdin, content)
-	}()
-
-	cmd := fmt.Sprintf("cat > %s", remotePath)
-	return session.Run(cmd)
-}
-
-func lineInString(content, regexpPattern, line string) string {
-	scanner := bufio.NewScanner(strings.NewReader(content))
-	var lines []string
-	found := false
-	re := regexp.MustCompile(regexpPattern)
-
-	for scanner.Scan() {
-		l := scanner.Text()
-		if re.MatchString(l) {
-			found = true
-			lines = append(lines, line)
-		} else {
-			lines = append(lines, l)
-		}
-	}
-	if !found {
-		lines = append(lines, line)
-	}
-	return strings.Join(lines, "\n") + "\n"
-}
-
-func Call() {
-	user := "youruser"
-	password := "yourpassword"
-	host := "yourhost"
-	port := 22
-	remotePath := "/path/to/remote/file"
-
-	client, err := sshConnect(user, password, host, port)
-	if err != nil {
-		fmt.Println("SSH connection error:", err)
-		return
-	}
-	defer client.Close()
-
-	content, err := sshReadFile(client, remotePath)
-	if err != nil {
-		fmt.Println("Read error:", err)
-		return
-	}
-
-	newContent := lineInString(content, "^foo=", "foo=bar")
-
-	if err := sshWriteFile(client, remotePath, newContent); err != nil {
-		fmt.Println("Write error:", err)
-		return
-	}
-
-	fmt.Println("Line updated successfully over SSH.")
-}
-
-type LineInFile struct {
-	RemotePath    string         // Path to the remote file
-	Pattern       string         // Regex pattern to match lines
-	Line          string         // Line to insert or replace
-	InsertAfter   bool           // If true, insert after matched line; else replace
-	User          string         // SSH username
-	Password      string         // SSH password (use key for production)
-	Host          string         // SSH host
-	Port          int            // SSH port
-	regexCompiled *regexp.Regexp // Compiled regex (internal use)
-}
-
-// CompileRegex compiles the regex pattern for later use
-func (l *LineInFile) CompileRegex() error {
-	re, err := regexp.Compile(l.Pattern)
-	if err != nil {
-		return err
-	}
-	l.regexCompiled = re
-	return nil
-}
--- a/pkg/backy/list.go
+++ b/pkg/backy/list.go
@ -23,7 +23,8 @@ func (opts *ConfigOpts) ListCommand(cmd string) {
 	var cmdFound bool = false
 	var cmdInfo *Command
 	// check commands in file against cmd
-	for cmdInFile := range opts.Cmds {
+	for _, cmdInFile := range opts.executeCmds {
+		print(cmdInFile)
 		cmdFound = false

 		if cmd == cmdInFile {
@ -36,39 +37,28 @@ func (opts *ConfigOpts) ListCommand(cmd string) {
 	// print the command's information
 	if cmdFound {

-		println("Command: ")
+		print("Command: ")

 		print(cmdInfo.Cmd)
+		if len(cmdInfo.Args) >= 0 {

-		for _, v := range cmdInfo.Args {
-			print(" ") // print space between command and args
-			print(v)   // print command arg
+			for _, v := range cmdInfo.Args {
+				print(" ") // print space between command and args
+				print(v)   // print command arg
+			}
 		}

-		// is it remote or local
-		if !IsHostLocal(cmdInfo.Host) {
-			println()
+		// is is remote or local
+		if cmdInfo.Host != nil {
+
 			print("Host: ", cmdInfo.Host)
-			println()

 		} else {

-			println()
 			print("Host: Runs on Local Machine\n\n")

 		}

-		if cmdInfo.Dir != nil {
-			println()
-			print("Directory: ", *cmdInfo.Dir)
-			println()
-		}
-
-		if cmdInfo.Type.String() != "" {
-			print("Type: ", cmdInfo.Type.String())
-			println()
-		}
-
 	} else {

 		fmt.Printf("Command %s not found. Check spelling.\n", cmd)
@ -76,38 +66,3 @@ func (opts *ConfigOpts) ListCommand(cmd string) {
 	}

 }
-
-func (opts *ConfigOpts) ListCommandList(list string) {
-	// bool for commands not found
-	// gets set to false if a command is not found
-	// set to true if the command is found
-	var listFound bool = false
-	var listInfo *CmdList
-	// check commands in file against cmd
-	for listInFile, l := range opts.CmdConfigLists {
-		listFound = false
-
-		if list == listInFile {
-			listFound = true
-			listInfo = l
-			break
-		}
-	}
-
-	// print the command's information
-	if listFound {
-
-		println("List: ", list)
-		println()
-
-		for _, v := range listInfo.Order {
-			println()
-			opts.ListCommand(v)
-		}
-
-	} else {
-
-		fmt.Printf("List %s not found. Check spelling.\n", list)
-
-	}
-}
--- a/pkg/backy/metrics.go
+++ b/pkg/backy/metrics.go
@ -1,57 +0,0 @@
-package backy
-
-import (
-	"encoding/json"
-	"os"
-)
-
-type Metrics struct {
-	SuccessfulExecutions uint64  `json:"successful_executions"`
-	FailedExecutions     uint64  `json:"failed_executions"`
-	TotalExecutions      uint64  `json:"total_executions"`
-	ExecutionTime        float64 `json:"execution_time"`         // in seconds
-	AverageExecutionTime float64 `json:"average_execution_time"` // in seconds
-	SuccessRate          float64 `json:"success_rate"`           // percentage of successful executions
-	FailureRate          float64 `json:"failure_rate"`           // percentage of failed executions
-}
-
-func NewMetrics() *Metrics {
-	return &Metrics{
-		SuccessfulExecutions: 0,
-		FailedExecutions:     0,
-		TotalExecutions:      0,
-		ExecutionTime:        0.0,
-		AverageExecutionTime: 0.0,
-		SuccessRate:          0.0,
-		FailureRate:          0.0,
-	}
-}
-
-func (m *Metrics) Update(success bool, executionTime float64) {
-	m.TotalExecutions++
-	if success {
-		m.SuccessfulExecutions++
-	} else {
-		m.FailedExecutions++
-	}
-
-	m.ExecutionTime += executionTime
-	m.AverageExecutionTime = m.ExecutionTime / float64(m.TotalExecutions)
-
-	if m.TotalExecutions > 0 {
-		m.SuccessRate = float64(m.SuccessfulExecutions) / float64(m.TotalExecutions) * 100
-		m.FailureRate = float64(m.FailedExecutions) / float64(m.TotalExecutions) * 100
-	}
-}
-
-func SaveToFile(metrics *Metrics, filename string) error {
-	data, err := json.MarshalIndent(metrics, "", "  ")
-	if err != nil {
-		return err
-	}
-	return os.WriteFile(filename, data, 0644)
-}
-
-func LoadFromFile(filename string) (*Metrics, error) {
-	return nil, nil
-}
--- a/pkg/backy/metrics_test.go
+++ b/pkg/backy/metrics_test.go
@ -1,7 +0,0 @@
-package backy
-
-import "testing"
-
-func TestAddingMetricsForCommand(t *testing.T) {
-
-}
--- a/pkg/backy/notification.go
+++ b/pkg/backy/notification.go
@ -9,7 +9,6 @@ import (

 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
 	"github.com/nikoksr/notify"
-	"github.com/nikoksr/notify/service/http"
 	"github.com/nikoksr/notify/service/mail"
 	"github.com/nikoksr/notify/service/matrix"
 	"maunium.net/go/mautrix/id"
@ -31,12 +30,6 @@ type MailConfig struct {
 	Password      string   `yaml:"password"`
 }

-type HttpConfig struct {
-	URL     string              `yaml:"url"`
-	Method  string              `yaml:"method"`
-	Headers map[string][]string `yaml:"headers"`
-}
-
 // SetupNotify sets up notify instances for each command list.
 func (opts *ConfigOpts) SetupNotify() {

@ -65,8 +58,6 @@ func (opts *ConfigOpts) SetupNotify() {
 					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in mail object", confId)).Str("list", confName).Send()
 					continue
 				}
-				conf.Password = getExternalConfigDirectiveValue(conf.Password, opts, AllowedExternalDirectiveAll)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding mail notification service")
 				mailConf := setupMail(conf)
 				services = append(services, mailConf)
 			case "matrix":
@ -75,23 +66,14 @@ func (opts *ConfigOpts) SetupNotify() {
 					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in matrix object", confId)).Str("list", confName).Send()
 					continue
 				}
-				conf.AccessToken = getExternalConfigDirectiveValue(conf.AccessToken, opts, AllowedExternalDirectiveAll)
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding matrix notification service")
 				mtrxConf, mtrxErr := setupMatrix(conf)
 				if mtrxErr != nil {
 					opts.Logger.Info().Str("list", confName).Err(fmt.Errorf("error: configuring matrix id %s failed during setup: %w", id, mtrxErr))
 					continue
 				}
+				// append the services
 				services = append(services, mtrxConf)
-			case "http":
-				conf, ok := opts.NotificationConf.HttpConfig[confId]
-				if !ok {
-					opts.Logger.Info().Err(fmt.Errorf("error: ID %s not found in http object", confId)).Str("list", confName).Send()
-					continue
-				}
-				opts.Logger.Debug().Str("list", confName).Str("id", confId).Msg("adding http notification service")
-				httpConf := setupHttp(conf)
-				services = append(services, httpConf)
+			// service is not recognized
 			default:
 				opts.Logger.Info().Err(fmt.Errorf("id %s not found", id)).Str("list", confName).Send()
 			}
@ -117,19 +99,3 @@ func setupMail(config MailConfig) *mail.Mail {
 	mailClient.BodyFormat(mail.PlainText)
 	return mailClient
 }
-
-func setupHttp(httpConf HttpConfig) *http.Service {
-
-	httpService := http.New()
-	httpService.AddReceivers(&http.Webhook{
-		URL:         httpConf.URL,
-		Header:      httpConf.Headers,
-		ContentType: "text/plain",
-		Method:      httpConf.Method,
-		BuildPayload: func(subject, message string) (payload any) {
-			return subject + "\n\n" + message
-		},
-	})
-
-	return httpService
-}
--- a/pkg/backy/packageoperation_enumer.go
+++ b/pkg/backy/packageoperation_enumer.go
@ -1,145 +0,0 @@
-// Code generated by "enumer -linecomment -yaml -text -json -type=PackageOperation"; DO NOT EDIT.
-
-package backy
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-)
-
-const _PackageOperationName = "installupgradepurgeremovecheckVersionisInstalled"
-
-var _PackageOperationIndex = [...]uint8{0, 0, 7, 14, 19, 25, 37, 48}
-
-const _PackageOperationLowerName = "installupgradepurgeremovecheckversionisinstalled"
-
-func (i PackageOperation) String() string {
-	if i < 0 || i >= PackageOperation(len(_PackageOperationIndex)-1) {
-		return fmt.Sprintf("PackageOperation(%d)", i)
-	}
-	return _PackageOperationName[_PackageOperationIndex[i]:_PackageOperationIndex[i+1]]
-}
-
-// An "invalid array index" compiler error signifies that the constant values have changed.
-// Re-run the stringer command to generate them again.
-func _PackageOperationNoOp() {
-	var x [1]struct{}
-	_ = x[DefaultPO-(0)]
-	_ = x[PackageOperationInstall-(1)]
-	_ = x[PackageOperationUpgrade-(2)]
-	_ = x[PackageOperationPurge-(3)]
-	_ = x[PackageOperationRemove-(4)]
-	_ = x[PackageOperationCheckVersion-(5)]
-	_ = x[PackageOperationIsInstalled-(6)]
-}
-
-var _PackageOperationValues = []PackageOperation{DefaultPO, PackageOperationInstall, PackageOperationUpgrade, PackageOperationPurge, PackageOperationRemove, PackageOperationCheckVersion, PackageOperationIsInstalled}
-
-var _PackageOperationNameToValueMap = map[string]PackageOperation{
-	_PackageOperationName[0:0]:        DefaultPO,
-	_PackageOperationLowerName[0:0]:   DefaultPO,
-	_PackageOperationName[0:7]:        PackageOperationInstall,
-	_PackageOperationLowerName[0:7]:   PackageOperationInstall,
-	_PackageOperationName[7:14]:       PackageOperationUpgrade,
-	_PackageOperationLowerName[7:14]:  PackageOperationUpgrade,
-	_PackageOperationName[14:19]:      PackageOperationPurge,
-	_PackageOperationLowerName[14:19]: PackageOperationPurge,
-	_PackageOperationName[19:25]:      PackageOperationRemove,
-	_PackageOperationLowerName[19:25]: PackageOperationRemove,
-	_PackageOperationName[25:37]:      PackageOperationCheckVersion,
-	_PackageOperationLowerName[25:37]: PackageOperationCheckVersion,
-	_PackageOperationName[37:48]:      PackageOperationIsInstalled,
-	_PackageOperationLowerName[37:48]: PackageOperationIsInstalled,
-}
-
-var _PackageOperationNames = []string{
-	_PackageOperationName[0:0],
-	_PackageOperationName[0:7],
-	_PackageOperationName[7:14],
-	_PackageOperationName[14:19],
-	_PackageOperationName[19:25],
-	_PackageOperationName[25:37],
-	_PackageOperationName[37:48],
-}
-
-// PackageOperationString retrieves an enum value from the enum constants string name.
-// Throws an error if the param is not part of the enum.
-func PackageOperationString(s string) (PackageOperation, error) {
-	if val, ok := _PackageOperationNameToValueMap[s]; ok {
-		return val, nil
-	}
-
-	if val, ok := _PackageOperationNameToValueMap[strings.ToLower(s)]; ok {
-		return val, nil
-	}
-	return 0, fmt.Errorf("%s does not belong to PackageOperation values", s)
-}
-
-// PackageOperationValues returns all values of the enum
-func PackageOperationValues() []PackageOperation {
-	return _PackageOperationValues
-}
-
-// PackageOperationStrings returns a slice of all String values of the enum
-func PackageOperationStrings() []string {
-	strs := make([]string, len(_PackageOperationNames))
-	copy(strs, _PackageOperationNames)
-	return strs
-}
-
-// IsAPackageOperation returns "true" if the value is listed in the enum definition. "false" otherwise
-func (i PackageOperation) IsAPackageOperation() bool {
-	for _, v := range _PackageOperationValues {
-		if i == v {
-			return true
-		}
-	}
-	return false
-}
-
-// MarshalJSON implements the json.Marshaler interface for PackageOperation
-func (i PackageOperation) MarshalJSON() ([]byte, error) {
-	return json.Marshal(i.String())
-}
-
-// UnmarshalJSON implements the json.Unmarshaler interface for PackageOperation
-func (i *PackageOperation) UnmarshalJSON(data []byte) error {
-	var s string
-	if err := json.Unmarshal(data, &s); err != nil {
-		return fmt.Errorf("PackageOperation should be a string, got %s", data)
-	}
-
-	var err error
-	*i, err = PackageOperationString(s)
-	return err
-}
-
-// MarshalText implements the encoding.TextMarshaler interface for PackageOperation
-func (i PackageOperation) MarshalText() ([]byte, error) {
-	return []byte(i.String()), nil
-}
-
-// UnmarshalText implements the encoding.TextUnmarshaler interface for PackageOperation
-func (i *PackageOperation) UnmarshalText(text []byte) error {
-	var err error
-	*i, err = PackageOperationString(string(text))
-	return err
-}
-
-// MarshalYAML implements a YAML Marshaler for PackageOperation
-func (i PackageOperation) MarshalYAML() (interface{}, error) {
-	return i.String(), nil
-}
-
-// UnmarshalYAML implements a YAML Unmarshaler for PackageOperation
-func (i *PackageOperation) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	if err := unmarshal(&s); err != nil {
-		return err
-	}
-
-	var err error
-	*i, err = PackageOperationString(s)
-	return err
-}
--- a/pkg/backy/ssh.go
+++ b/pkg/backy/ssh.go
@ -15,78 +15,76 @@ import (
 	"strings"
 	"time"

-	"github.com/google/uuid"
 	"github.com/kevinburke/ssh_config"
 	"github.com/pkg/errors"
-	"github.com/pkg/sftp"
 	"github.com/rs/zerolog"
 	"golang.org/x/crypto/ssh"
 	"golang.org/x/crypto/ssh/knownhosts"
 )

-var PrivateKeyExtraInfoErr = errors.New("Private key may be encrypted. \nIf encrypted, make sure the password is specified correctly in the correct section. This may be done in one of two ways: \n Using external directives - see docs \n privatekeypassword: password (not recommended). \n ")
+var PrivateKeyExtraInfoErr = errors.New("Private key may be encrypted. \nIf encrypted, make sure the password is specified correctly in the correct section. This may be done in one of three ways: \n privatekeypassword: env:PR_KEY_PASS \n privatekeypassword: file:/path/to/password-file \n privatekeypassword: password (not recommended). \n ")
 var TS = strings.TrimSpace

 // ConnectToHost connects to a host by looking up the config values in the file ~/.ssh/config
 // It uses any set values and looks up an unset values in the config files
-// remoteHost is modified directly. The *ssh.Client is returned as part of remoteHost,
+// remoteConfig is modified directly. The *ssh.Client is returned as part of remoteConfig,
 // If configFile is empty, any required configuration is looked up in the default config files
 // If any value is not found, defaults are used
-func (remoteHost *Host) ConnectToHost(opts *ConfigOpts) error {
+func (remoteConfig *Host) ConnectToHost(opts *ConfigOpts) error {

 	var connectErr error

-	if TS(remoteHost.ConfigFilePath) == "" {
-		remoteHost.useDefaultConfig = true
+	if TS(remoteConfig.ConfigFilePath) == "" {
+		remoteConfig.useDefaultConfig = true
 	}

-	khPathErr := remoteHost.GetKnownHosts()
+	khPathErr := remoteConfig.GetKnownHosts()

 	if khPathErr != nil {
 		return khPathErr
 	}

-	if remoteHost.ClientConfig == nil {
-		remoteHost.ClientConfig = &ssh.ClientConfig{}
+	if remoteConfig.ClientConfig == nil {
+		remoteConfig.ClientConfig = &ssh.ClientConfig{}
 	}

 	var configFile *os.File

 	var sshConfigFileOpenErr error

-	if !remoteHost.useDefaultConfig {
+	if !remoteConfig.useDefaultConfig {
 		var err error
-		remoteHost.ConfigFilePath, err = getFullPathWithHomeDir(remoteHost.ConfigFilePath)
+		remoteConfig.ConfigFilePath, err = resolveDir(remoteConfig.ConfigFilePath)
 		if err != nil {
 			return err
 		}
-		configFile, sshConfigFileOpenErr = os.Open(remoteHost.ConfigFilePath)
+		configFile, sshConfigFileOpenErr = os.Open(remoteConfig.ConfigFilePath)
 		if sshConfigFileOpenErr != nil {
 			return sshConfigFileOpenErr
 		}
 	} else {
-		defaultConfig, _ := getFullPathWithHomeDir("~/.ssh/config")
+		defaultConfig, _ := resolveDir("~/.ssh/config")
 		configFile, sshConfigFileOpenErr = os.Open(defaultConfig)
 		if sshConfigFileOpenErr != nil {
 			return sshConfigFileOpenErr
 		}
 	}
-	remoteHost.SSHConfigFile = &sshConfigFile{}
-	remoteHost.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
+	remoteConfig.SSHConfigFile = &sshConfigFile{}
+	remoteConfig.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
 	var decodeErr error
-	remoteHost.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
+	remoteConfig.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
 	if decodeErr != nil {
 		return decodeErr
 	}

-	err := remoteHost.GetProxyJumpFromConfig(opts.Hosts)
+	err := remoteConfig.GetProxyJumpFromConfig(opts.Hosts)

 	if err != nil {
 		return err
 	}

-	if remoteHost.ProxyHost != nil {
-		for _, proxyHost := range remoteHost.ProxyHost {
+	if remoteConfig.ProxyHost != nil {
+		for _, proxyHost := range remoteConfig.ProxyHost {
 			err := proxyHost.GetProxyJumpConfig(opts.Hosts, opts)
 			opts.Logger.Info().Msgf("Proxy host: %s", proxyHost.Host)
 			if err != nil {
@ -95,49 +93,50 @@ func (remoteHost *Host) ConnectToHost(opts *ConfigOpts) error {
 		}
 	}

-	remoteHost.ClientConfig.Timeout = time.Second * 30
+	remoteConfig.ClientConfig.Timeout = time.Second * 30

-	remoteHost.GetPrivateKeyFileFromConfig()
+	remoteConfig.GetPrivateKeyFileFromConfig()

-	remoteHost.GetPort()
+	remoteConfig.GetPort()

-	remoteHost.GetHostName()
+	remoteConfig.GetHostName()

-	remoteHost.CombineHostNameWithPort()
+	remoteConfig.CombineHostNameWithPort()

-	remoteHost.GetSshUserFromConfig()
+	remoteConfig.GetSshUserFromConfig()

-	if remoteHost.HostName == "" {
-		return errors.Errorf("No hostname found or specified for host %s", remoteHost.Host)
+	if remoteConfig.HostName == "" {
+		return errors.Errorf("No hostname found or specified for host %s", remoteConfig.Host)
 	}

-	err = remoteHost.GetAuthMethods(opts)
+	err = remoteConfig.GetAuthMethods(opts)
 	if err != nil {
 		return err
 	}

-	hostKeyCallback, err := knownhosts.New(remoteHost.KnownHostsFile)
+	hostKeyCallback, err := knownhosts.New(remoteConfig.KnownHostsFile)
 	if err != nil {
 		return errors.Wrap(err, "could not create hostkeycallback function")
 	}
-	remoteHost.ClientConfig.HostKeyCallback = hostKeyCallback
+	remoteConfig.ClientConfig.HostKeyCallback = hostKeyCallback
+	// opts.Logger.Info().Str("user", remoteConfig.ClientConfig.User).Send()

-	remoteHost.SshClient, connectErr = remoteHost.ConnectThroughBastion(opts.Logger)
+	remoteConfig.SshClient, connectErr = remoteConfig.ConnectThroughBastion(opts.Logger)
 	if connectErr != nil {
 		return connectErr
 	}
-	if remoteHost.SshClient != nil {
-		opts.Hosts[remoteHost.Host] = remoteHost
+	if remoteConfig.SshClient != nil {
+		opts.Hosts[remoteConfig.Host] = remoteConfig
 		return nil
 	}

-	opts.Logger.Info().Msgf("Connecting to host %s", remoteHost.HostName)
-	remoteHost.SshClient, connectErr = ssh.Dial("tcp", remoteHost.HostName, remoteHost.ClientConfig)
+	opts.Logger.Info().Msgf("Connecting to host %s", remoteConfig.HostName)
+	remoteConfig.SshClient, connectErr = ssh.Dial("tcp", remoteConfig.HostName, remoteConfig.ClientConfig)
 	if connectErr != nil {
 		return connectErr
 	}

-	opts.Hosts[remoteHost.Host] = remoteHost
+	opts.Hosts[remoteConfig.Host] = remoteConfig
 	return nil
 }

@ -181,7 +180,11 @@ func (remoteHost *Host) GetAuthMethods(opts *ConfigOpts) error {
 			return err
 		}

-		remoteHost.PrivateKeyPassword = GetPrivateKeyPassword(remoteHost.PrivateKeyPassword, opts)
+		remoteHost.PrivateKeyPassword, err = GetPrivateKeyPassword(remoteHost.PrivateKeyPassword, opts, opts.Logger)
+
+		if err != nil {
+			return err
+		}

 		if remoteHost.PrivateKeyPassword == "" {

@ -204,13 +207,14 @@ func (remoteHost *Host) GetAuthMethods(opts *ConfigOpts) error {
 		}
 	}

-	if remoteHost.Password != "" {
+	if remoteHost.Password == "" {

-		opts.Logger.Debug().Str("password", remoteHost.Password).Str("Host", remoteHost.Host).Send()
+		remoteHost.Password, err = GetPassword(remoteHost.Password, opts, opts.Logger)

-		remoteHost.Password = GetPassword(remoteHost.Password, opts)
+		if err != nil {

-		// opts.Logger.Debug().Str("actual password", remoteHost.Password).Str("Host", remoteHost.Host).Send()
+			return err
+		}

 		remoteHost.ClientConfig.Auth = append(remoteHost.ClientConfig.Auth, ssh.Password(remoteHost.Password))
 	}
@ -227,8 +231,6 @@ func (remoteHost *Host) GetPrivateKeyFileFromConfig() {
 	var identityFile string
 	if remoteHost.PrivateKeyPath == "" {
 		identityFile, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "IdentityFile")
-		// println("Identity file:", identityFile)
-		// println("Host:", remoteHost.Host)
 		if identityFile == "" {
 			identityFile, _ = remoteHost.SSHConfigFile.DefaultUserSettings.GetStrict(remoteHost.Host, "IdentityFile")
 			if identityFile == "" {
@ -240,21 +242,22 @@ func (remoteHost *Host) GetPrivateKeyFileFromConfig() {
 		identityFile = remoteHost.PrivateKeyPath
 	}

-	// println("Identity file:", identityFile)
-	remoteHost.PrivateKeyPath, _ = getFullPathWithHomeDir(identityFile)
+	remoteHost.PrivateKeyPath, _ = resolveDir(identityFile)
 }

 // GetPort checks if the port from the config file is 0
 // If it is the port is searched in the SSH config file(s)
 func (remoteHost *Host) GetPort() {
 	port := fmt.Sprintf("%d", remoteHost.Port)
-	// port specified?
+	// port specifed?
 	// port will be 0 if missing from backy config
 	if port == "0" {
+		// get port from specified SSH config file
 		port, _ = remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "Port")

 		if port == "" {

+			// get port from default SSH config file
 			port = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "Port")

 			// set port to be default
@ -269,6 +272,7 @@ func (remoteHost *Host) GetPort() {

 func (remoteHost *Host) CombineHostNameWithPort() {

+	// if the port is already in the HostName, leave it
 	if strings.HasSuffix(remoteHost.HostName, fmt.Sprintf(":%d", remoteHost.Port)) {
 		return
 	}
@ -311,6 +315,7 @@ func (remoteHost *Host) ConnectThroughBastion(log zerolog.Logger) (*ssh.Client,
 		return nil, err
 	}

+	// sClient is an ssh client connected to the service host, through the bastion host.
 	sClient := ssh.NewClient(ncc, chans, reqs)

 	return sClient, nil
@ -318,44 +323,95 @@ func (remoteHost *Host) ConnectThroughBastion(log zerolog.Logger) (*ssh.Client,

 // GetKnownHosts resolves the host's KnownHosts file if it is defined
 // if not defined, the default location for this file is used
-func (remoteHost *Host) GetKnownHosts() error {
+func (remotehHost *Host) GetKnownHosts() error {
 	var knownHostsFileErr error
-	if TS(remoteHost.KnownHostsFile) != "" {
-		remoteHost.KnownHostsFile, knownHostsFileErr = getFullPathWithHomeDir(remoteHost.KnownHostsFile)
+	if TS(remotehHost.KnownHostsFile) != "" {
+		remotehHost.KnownHostsFile, knownHostsFileErr = resolveDir(remotehHost.KnownHostsFile)
 		return knownHostsFileErr
 	}
-	remoteHost.KnownHostsFile, knownHostsFileErr = getFullPathWithHomeDir("~/.ssh/known_hosts")
+	remotehHost.KnownHostsFile, knownHostsFileErr = resolveDir("~/.ssh/known_hosts")
 	return knownHostsFileErr
 }

-func GetPrivateKeyPassword(key string, opts *ConfigOpts) string {
-	return getExternalConfigDirectiveValue(key, opts, AllowedExternalDirectiveAll)
+func GetPrivateKeyPassword(key string, opts *ConfigOpts, log zerolog.Logger) (string, error) {
+
+	var prKeyPassword string
+	if strings.HasPrefix(key, "file:") {
+		privKeyPassFilePath := strings.TrimPrefix(key, "file:")
+		privKeyPassFilePath, _ = resolveDir(privKeyPassFilePath)
+		keyFile, keyFileErr := os.Open(privKeyPassFilePath)
+		if keyFileErr != nil {
+			return "", errors.Errorf("Private key password file %s failed to open. \n Make sure it is accessible and correct.", privKeyPassFilePath)
+		}
+		passwordScanner := bufio.NewScanner(keyFile)
+		for passwordScanner.Scan() {
+			prKeyPassword = passwordScanner.Text()
+		}
+	} else if strings.HasPrefix(key, "env:") {
+		privKey := strings.TrimPrefix(key, "env:")
+		privKey = strings.TrimPrefix(privKey, "${")
+		privKey = strings.TrimSuffix(privKey, "}")
+		privKey = strings.TrimPrefix(privKey, "$")
+		prKeyPassword = os.Getenv(privKey)
+	} else {
+		prKeyPassword = key
+	}
+	prKeyPassword = GetVaultKey(prKeyPassword, opts, opts.Logger)
+	return prKeyPassword, nil
 }

 // GetPassword gets any password
-func GetPassword(pass string, opts *ConfigOpts) string {
-	return getExternalConfigDirectiveValue(pass, opts, AllowedExternalDirectiveAll)
+func GetPassword(pass string, opts *ConfigOpts, log zerolog.Logger) (string, error) {
+
+	pass = strings.TrimSpace(pass)
+	if pass == "" {
+		return "", nil
+	}
+	var password string
+	if strings.HasPrefix(pass, "file:") {
+		passFilePath := strings.TrimPrefix(pass, "file:")
+		passFilePath, _ = resolveDir(passFilePath)
+		keyFile, keyFileErr := os.Open(passFilePath)
+		if keyFileErr != nil {
+			return "", errors.New("Password file failed to open")
+		}
+		passwordScanner := bufio.NewScanner(keyFile)
+		for passwordScanner.Scan() {
+			password = passwordScanner.Text()
+		}
+	} else if strings.HasPrefix(pass, "env:") {
+		passEnv := strings.TrimPrefix(pass, "env:")
+		passEnv = strings.TrimPrefix(passEnv, "${")
+		passEnv = strings.TrimSuffix(passEnv, "}")
+		passEnv = strings.TrimPrefix(passEnv, "$")
+		password = os.Getenv(passEnv)
+	} else {
+		password = pass
+	}
+	password = GetVaultKey(password, opts, opts.Logger)
+
+	return password, nil
 }

-func (remoteHost *Host) GetProxyJumpFromConfig(hosts map[string]*Host) error {
+func (remoteConfig *Host) GetProxyJumpFromConfig(hosts map[string]*Host) error {

-	proxyJump, _ := remoteHost.SSHConfigFile.SshConfigFile.Get(remoteHost.Host, "ProxyJump")
+	proxyJump, _ := remoteConfig.SSHConfigFile.SshConfigFile.Get(remoteConfig.Host, "ProxyJump")
 	if proxyJump == "" {
-		proxyJump = remoteHost.SSHConfigFile.DefaultUserSettings.Get(remoteHost.Host, "ProxyJump")
+		proxyJump = remoteConfig.SSHConfigFile.DefaultUserSettings.Get(remoteConfig.Host, "ProxyJump")
 	}
-	if remoteHost.ProxyJump == "" && proxyJump != "" {
-		remoteHost.ProxyJump = proxyJump
+	if remoteConfig.ProxyJump == "" && proxyJump != "" {
+		remoteConfig.ProxyJump = proxyJump
 	}
-	proxyJumpHosts := strings.Split(remoteHost.ProxyJump, ",")
-	if remoteHost.ProxyHost == nil && len(proxyJumpHosts) == 1 {
-		remoteHost.ProxyJump = proxyJump
+	proxyJumpHosts := strings.Split(remoteConfig.ProxyJump, ",")
+	if remoteConfig.ProxyHost == nil && len(proxyJumpHosts) == 1 {
+		remoteConfig.ProxyJump = proxyJump
 		proxyHost, proxyHostFound := hosts[proxyJump]
 		if proxyHostFound {
-			remoteHost.ProxyHost = append(remoteHost.ProxyHost, proxyHost)
+			remoteConfig.ProxyHost = append(remoteConfig.ProxyHost, proxyHost)
 		} else {
 			if proxyJump != "" {
 				newProxy := &Host{Host: proxyJump}
-				remoteHost.ProxyHost = append(remoteHost.ProxyHost, newProxy)
+				remoteConfig.ProxyHost = append(remoteConfig.ProxyHost, newProxy)
 			}
 		}
 	}
@ -363,68 +419,69 @@ func (remoteHost *Host) GetProxyJumpFromConfig(hosts map[string]*Host) error {
 	return nil
 }

-func (remoteHost *Host) GetProxyJumpConfig(hosts map[string]*Host, opts *ConfigOpts) error {
+func (remoteConfig *Host) GetProxyJumpConfig(hosts map[string]*Host, opts *ConfigOpts) error {

-	if TS(remoteHost.ConfigFilePath) == "" {
-		remoteHost.useDefaultConfig = true
+	if TS(remoteConfig.ConfigFilePath) == "" {
+		remoteConfig.useDefaultConfig = true
 	}

-	khPathErr := remoteHost.GetKnownHosts()
+	khPathErr := remoteConfig.GetKnownHosts()

 	if khPathErr != nil {
 		return khPathErr
 	}
-	if remoteHost.ClientConfig == nil {
-		remoteHost.ClientConfig = &ssh.ClientConfig{}
+	if remoteConfig.ClientConfig == nil {
+		remoteConfig.ClientConfig = &ssh.ClientConfig{}
 	}
 	var configFile *os.File
 	var sshConfigFileOpenErr error
-	if !remoteHost.useDefaultConfig {
+	if !remoteConfig.useDefaultConfig {

-		configFile, sshConfigFileOpenErr = os.Open(remoteHost.ConfigFilePath)
+		configFile, sshConfigFileOpenErr = os.Open(remoteConfig.ConfigFilePath)
 		if sshConfigFileOpenErr != nil {
 			return sshConfigFileOpenErr
 		}
 	} else {
-		defaultConfig, _ := getFullPathWithHomeDir("~/.ssh/config")
+		defaultConfig, _ := resolveDir("~/.ssh/config")
 		configFile, sshConfigFileOpenErr = os.Open(defaultConfig)
 		if sshConfigFileOpenErr != nil {
 			return sshConfigFileOpenErr
 		}
 	}
-	remoteHost.SSHConfigFile = &sshConfigFile{}
-	remoteHost.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
+	remoteConfig.SSHConfigFile = &sshConfigFile{}
+	remoteConfig.SSHConfigFile.DefaultUserSettings = ssh_config.DefaultUserSettings
 	var decodeErr error
-	remoteHost.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
+	remoteConfig.SSHConfigFile.SshConfigFile, decodeErr = ssh_config.Decode(configFile)
 	if decodeErr != nil {
 		return decodeErr
 	}
-	remoteHost.GetPrivateKeyFileFromConfig()
-	remoteHost.GetPort()
-	remoteHost.GetHostName()
-	remoteHost.CombineHostNameWithPort()
-	remoteHost.GetSshUserFromConfig()
-	remoteHost.isProxyHost = true
-	if remoteHost.HostName == "" {
-		return errors.Errorf("No hostname found or specified for host %s", remoteHost.Host)
+	remoteConfig.GetPrivateKeyFileFromConfig()
+	remoteConfig.GetPort()
+	remoteConfig.GetHostName()
+	remoteConfig.CombineHostNameWithPort()
+	remoteConfig.GetSshUserFromConfig()
+	remoteConfig.isProxyHost = true
+	if remoteConfig.HostName == "" {
+		return errors.Errorf("No hostname found or specified for host %s", remoteConfig.Host)
 	}
-	err := remoteHost.GetAuthMethods(opts)
+	err := remoteConfig.GetAuthMethods(opts)
 	if err != nil {
 		return err
 	}

 	// TODO: Add value/option to config for host key and add bool to check for host key
-	hostKeyCallback, err := knownhosts.New(remoteHost.KnownHostsFile)
+	hostKeyCallback, err := knownhosts.New(remoteConfig.KnownHostsFile)
 	if err != nil {
 		return fmt.Errorf("could not create hostkeycallback function: %v", err)
 	}
-	remoteHost.ClientConfig.HostKeyCallback = hostKeyCallback
-	hosts[remoteHost.Host] = remoteHost
+	remoteConfig.ClientConfig.HostKeyCallback = hostKeyCallback
+	hosts[remoteConfig.Host] = remoteConfig

 	return nil
 }

-func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([]string, error) {
+// RunCmdSSH runs commands over SSH.
+func (command *Command) RunCmdSSH(cmdCtxLogger zerolog.Logger, opts *ConfigOpts) ([]string, error) {
 	var (
 		ArgsStr       string
 		cmdOutBuf     bytes.Buffer
@ -435,7 +492,10 @@ func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOp
 			env:  command.Environment,
 		}
 	)
-	command = getCommandTypeAndSetCommandInfo(command)
+	// Get the command type
+	// This must be done before concatenating the arguments
+	command.Type = strings.TrimSpace(command.Type)
+	command = getCommandType(command)

 	// Prepare command arguments
 	for _, v := range command.Args {
@ -444,8 +504,8 @@ func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOp

 	cmdCtxLogger.Info().
 		Str("Command", command.Name).
-		Str("Host", command.Host).
-		Msgf("Running %s on host %s", getCommandTypeAndSetCommandInfoLabel(command.Type), command.Host)
+		Str("Host", *command.Host).
+		Msgf("Running %s on host %s", getCommandTypeLabel(command.Type), *command.Host)

 	// cmdCtxLogger.Debug().Str("cmd", command.Cmd).Strs("args", command.Args).Send()

@ -476,14 +536,12 @@ func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOp

 	// Handle command execution based on type
 	switch command.Type {
-	case ScriptCommandType:
+	case "script":
 		return command.runScript(commandSession, cmdCtxLogger, &cmdOutBuf)
-	case RemoteScriptCommandType:
-		return command.runRemoteScript(commandSession, cmdCtxLogger, &cmdOutBuf)
-	case ScriptFileCommandType:
+	case "scriptFile":
 		return command.runScriptFile(commandSession, cmdCtxLogger, &cmdOutBuf)
-	case PackageCommandType:
-		if command.PackageOperation == PackageOperationCheckVersion {
+	case "package":
+		if command.PackageOperation == "checkVersion" {
 			commandSession.Stderr = nil
 			// Execute the package version command remotely
 			// Parse the output of package version command
@ -500,7 +558,7 @@ func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOp
 			cmdCtxLogger.Debug().Str("cmd + args", ArgsStr).Send()
 			// Run simple command
 			if err := commandSession.Run(ArgsStr); err != nil {
-				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error running command: %w", err)
+				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, true), fmt.Errorf("error running command: %w", err)
 			}
 		}
 	default:
@ -510,108 +568,17 @@ func (command *Command) RunCmdOnHost(cmdCtxLogger zerolog.Logger, opts *ConfigOp
 			ArgsStr = fmt.Sprintf("%s %s", command.Cmd, ArgsStr)
 		}
 		cmdCtxLogger.Debug().Str("cmd + args", ArgsStr).Send()
-
-		if command.Type == UserCommandType && command.UserOperation == "password" {
-			// cmdCtxLogger.Debug().Msgf("adding stdin")
-
-			userNamePass := fmt.Sprintf("%s:%s", command.Username, command.UserPassword)
-			client, err := sftp.NewClient(command.RemoteHost.SshClient)
-			if err != nil {
-				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating sftp client: %v", err)
-			}
-			uuidFile := uuid.New()
-			passFilePath := fmt.Sprintf("/tmp/%s", uuidFile.String())
-			passFile, passFileErr := client.Create(passFilePath)
-			if passFileErr != nil {
-				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating file /tmp/%s: %v", uuidFile.String(), passFileErr)
-			}
-
-			_, err = passFile.Write([]byte(userNamePass))
-			if err != nil {
-				return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error writing to file /tmp/%s: %v", uuidFile.String(), err)
-			}
-
-			ArgsStr = fmt.Sprintf("cat %s | chpasswd", passFilePath)
-			defer passFile.Close()
-
-			rmFileFunc := func() {
-				_ = client.Remove(passFilePath)
-			}
-
-			defer rmFileFunc()
-			// commandSession.Stdin = command.stdin
-		}
+		// Run simple command
 		if err := commandSession.Run(ArgsStr); err != nil {
-			return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error running command: %w", err)
-		}
-
-		if command.Type == UserCommandType {
-
-			// REFACTOR IF/WHEN WINDOWS SUPPORT IS ADDED
-
-			if command.UserOperation == "add" {
-				if command.UserSshPubKeys != nil {
-					var (
-						f        *sftp.File
-						err      error
-						userHome []byte
-						client   *sftp.Client
-					)
-
-					cmdCtxLogger.Info().Msg("adding SSH Keys")
-
-					commandSession, _ = command.RemoteHost.createSSHSession(opts)
-					userHome, err = commandSession.CombinedOutput(fmt.Sprintf("grep \"%s\" /etc/passwd | cut -d: -f6", command.Username))
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error finding user home from /etc/passwd: %v", err)
-					}
-
-					command.UserHome = strings.TrimSpace(string(userHome))
-					userSshDir := fmt.Sprintf("%s/.ssh", command.UserHome)
-					client, err = sftp.NewClient(command.RemoteHost.SshClient)
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating sftp client: %v", err)
-					}
-
-					err = client.MkdirAll(userSshDir)
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error creating directory %s: %v", userSshDir, err)
-					}
-					_, err = client.Create(fmt.Sprintf("%s/authorized_keys", userSshDir))
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error opening file %s/authorized_keys: %v", userSshDir, err)
-					}
-					f, err = client.OpenFile(fmt.Sprintf("%s/authorized_keys", userSshDir), os.O_APPEND|os.O_CREATE|os.O_WRONLY)
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error opening file %s/authorized_keys: %v", userSshDir, err)
-					}
-					defer f.Close()
-					for _, k := range command.UserSshPubKeys {
-						buf := bytes.NewBufferString(k)
-						cmdCtxLogger.Info().Str("key", k).Msg("adding SSH key")
-						if _, err := f.ReadFrom(buf); err != nil {
-							return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error adding to authorized keys: %v", err)
-						}
-					}
-
-					commandSession, _ = command.RemoteHost.createSSHSession(opts)
-					_, err = commandSession.CombinedOutput(fmt.Sprintf("chown -R %s:%s %s", command.Username, command.Username, userHome))
-					if err != nil {
-						return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), err
-					}
-
-				}
-			}
+			return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.GetOutput), fmt.Errorf("error running command: %w", err)
 		}
 	}

-	return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), nil
+	return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, true), nil
 }

 func checkPackageVersion(cmdCtxLogger zerolog.Logger, command *Command, commandSession *ssh.Session, cmdOutBuf bytes.Buffer) ([]string, error) {
-	for _, p := range command.Packages {
-		cmdCtxLogger.Info().Str("package", p.Name).Msg("Checking package versions")
-	}
+	cmdCtxLogger.Info().Str("package", command.PackageName).Msg("Checking package versions")
 	// Prepare command arguments
 	ArgsStr := command.Cmd
 	for _, v := range command.Args {
@ -626,17 +593,17 @@ func checkPackageVersion(cmdCtxLogger zerolog.Logger, command *Command, commandS

 		_, parseErr := parsePackageVersion(string(cmdOut), cmdCtxLogger, command, cmdOutBuf)
 		if parseErr != nil {
-			return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error: packages %v not listed: %w", command.Packages, err)
+			return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.GetOutput), fmt.Errorf("error: package %s not listed: %w", command.PackageName, err)
 		}
-		return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error running %s: %w", ArgsStr, err)
+		return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.GetOutput), fmt.Errorf("error running %s: %w", ArgsStr, err)
 	}

 	return parsePackageVersion(string(cmdOut), cmdCtxLogger, command, cmdOutBuf)
 }

-// getCommandTypeAndSetCommandInfoLabel returns a human-readable label for the command type.
-func getCommandTypeAndSetCommandInfoLabel(commandType CommandType) string {
-	if !commandType.IsACommandType() {
+// getCommandTypeLabel returns a human-readable label for the command type.
+func getCommandTypeLabel(commandType string) string {
+	if commandType == "" {
 		return "command"
 	}
 	return fmt.Sprintf("%s command", commandType)
@ -658,7 +625,7 @@ func (command *Command) runScript(session *ssh.Session, cmdCtxLogger zerolog.Log
 		return collectOutput(outputBuf, command.Name, cmdCtxLogger, true), fmt.Errorf("error waiting for shell: %w", err)
 	}

-	return collectOutput(outputBuf, command.Name, cmdCtxLogger, command.Output.ToLog), nil
+	return collectOutput(outputBuf, command.Name, cmdCtxLogger, command.GetOutput), nil
 }

 // runScriptFile handles the execution of script files.
@ -677,7 +644,7 @@ func (command *Command) runScriptFile(session *ssh.Session, cmdCtxLogger zerolog
 		return collectOutput(outputBuf, command.Name, cmdCtxLogger, true), fmt.Errorf("error waiting for shell: %w", err)
 	}

-	return collectOutput(outputBuf, command.Name, cmdCtxLogger, command.Output.ToLog), nil
+	return collectOutput(outputBuf, command.Name, cmdCtxLogger, true), nil
 }

 // prepareScriptBuffer prepares a buffer for inline scripts.
@ -721,28 +688,9 @@ func (command *Command) prepareScriptFileBuffer() (*bytes.Buffer, error) {
 	return &buffer, nil
 }

-// runRemoteScript handles the execution of remote scripts
-func (command *Command) runRemoteScript(session *ssh.Session, cmdCtxLogger zerolog.Logger, outputBuf *bytes.Buffer) ([]string, error) {
-	script, err := command.Fetcher.Fetch(command.Cmd)
-	if err != nil {
-		return nil, err
-	}
-	if command.Shell == "" {
-		command.Shell = "sh"
-	}
-	session.Stdin = bytes.NewReader(script)
-	err = session.Run(command.Shell)
-
-	if err != nil {
-		return collectOutput(outputBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error running remote script: %w", err)
-	}
-
-	return collectOutput(outputBuf, command.Name, cmdCtxLogger, command.Output.ToLog), nil
-}
-
 // readFileToBuffer reads a file into a buffer.
 func readFileToBuffer(filePath string) (*bytes.Buffer, error) {
-	resolvedPath, err := getFullPathWithHomeDir(filePath)
+	resolvedPath, err := resolveDir(filePath)
 	if err != nil {
 		return nil, err
 	}
@ -810,7 +758,7 @@ func (h *Host) DetectOS(opts *ConfigOpts) (string, error) {
 	return osName, nil
 }

-func DoesHostHaveHostName(host string) (bool, string) {
+func CheckIfHostHasHostName(host string) (bool, string) {
 	HostName, err := ssh_config.DefaultUserSettings.GetStrict(host, "HostName")
 	if err != nil {
 		return false, ""
@ -818,8 +766,3 @@ func DoesHostHaveHostName(host string) (bool, string) {
 	println(HostName)
 	return HostName != "", HostName
 }
-
-func IsHostLocal(host string) bool {
-	host = strings.ToLower(host)
-	return host == "127.0.0.1" || host == "localhost" || host == ""
-}
--- a/pkg/backy/tools.go
+++ b/pkg/backy/tools.go
@ -1,8 +0,0 @@
-//go:build tools
-
-package backy
-
-import (
-	// Protect this entry in go.mod from being removed by go mod tidy.
-	_ "github.com/dmarkham/enumer"
-)
--- a/pkg/backy/types.go
+++ b/pkg/backy/types.go
@ -7,7 +7,6 @@ import (
 	"strings"

 	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman"
-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
 	"git.andrewnw.xyz/CyberShell/backy/pkg/remotefetcher"
 	"git.andrewnw.xyz/CyberShell/backy/pkg/usermanager"
 	vaultapi "github.com/hashicorp/vault/api"
@ -27,15 +26,15 @@ type (
 		ConfigFilePath     string `yaml:"config,omitempty"`
 		Host               string `yaml:"host,omitempty"`
 		HostName           string `yaml:"hostname,omitempty"`
-		KnownHostsFile     string `yaml:"knownHostsFile,omitempty"`
+		KnownHostsFile     string `yaml:"knownhostsfile,omitempty"`
 		ClientConfig       *ssh.ClientConfig
 		SSHConfigFile      *sshConfigFile
 		SshClient          *ssh.Client
 		Port               uint16 `yaml:"port,omitempty"`
 		ProxyJump          string `yaml:"proxyjump,omitempty"`
 		Password           string `yaml:"password,omitempty"`
-		PrivateKeyPath     string `yaml:"IdentityFile,omitempty"`
-		PrivateKeyPassword string `yaml:"privateKeyPassword,omitempty"`
+		PrivateKeyPath     string `yaml:"privatekeypath,omitempty"`
+		PrivateKeyPassword string `yaml:"privatekeypassword,omitempty"`
 		useDefaultConfig   bool
 		User               string `yaml:"user,omitempty"`
 		isProxyHost        bool
@ -52,83 +51,100 @@ type (
 	Command struct {
 		Name string `yaml:"name,omitempty"`

+		// command to run
 		Cmd string `yaml:"cmd"`

-		// See CommandType enum further down the page for acceptable values
-		Type CommandType `yaml:"type,omitempty"`
+		// Possible values: script, scriptFile
+		// If blank, it is regular command.
+		Type string `yaml:"type,omitempty"`

-		Host string `yaml:"host,omitempty"`
+		// host on which to run cmd
+		Host *string `yaml:"host,omitempty"`

+		// Hooks are for running commands on certain events
 		Hooks *Hooks `yaml:"hooks,omitempty"`

+		// hook refs are internal references of commands for each hook type
 		hookRefs map[string]map[string]*Command

+		// Shell specifies which shell to run the command in, if any.
 		Shell string `yaml:"shell,omitempty"`

 		RemoteHost *Host `yaml:"-"`

+		// Args is an array that holds the arguments to cmd
 		Args []string `yaml:"args,omitempty"`

+		/*
+			Dir specifies a directory in which to run the command.
+			Ignored if Host is set.
+		*/
 		Dir *string `yaml:"dir,omitempty"`

+		// Env points to a file containing env variables to be used with the command
 		Env string `yaml:"env,omitempty"`

+		// Environment holds env variables to be used with the command
 		Environment []string `yaml:"environment,omitempty"`

-		ScriptEnvFile string `yaml:"scriptEnvFile"`
+		// Output determines if output is requested.
+		//
+		// Only for when command is in a list.
+		GetOutput bool `yaml:"getOutput,omitempty"`

-		Output struct {
-			File   string `yaml:"file,omitempty"`
-			ToLog  bool   `yaml:"toLog,omitempty"`
-			InList bool   `yaml:"inList,omitempty"`
-		} `yaml:"output"`
+		ScriptEnvFile string `yaml:"scriptEnvFile"`

 		// BEGIN PACKAGE COMMAND FIELDS

 		PackageManager string `yaml:"packageManager,omitempty"`

-		Packages []packagemanagercommon.Package `yaml:"packages,omitempty"`
+		PackageName string `yaml:"packageName,omitempty"`

+		// Version specifies the desired version for package execution
 		PackageVersion string `yaml:"packageVersion,omitempty"`

-		PackageOperation PackageOperation `yaml:"packageOperation,omitempty"`
+		// PackageOperation specifies the action for package-related commands (e.g., "install" or "remove")
+		PackageOperation string `yaml:"packageOperation,omitempty"`

 		pkgMan pkgman.PackageManager

 		packageCmdSet bool
 		// END PACKAGE COMMAND FIELDS

+		// RemoteSource specifies a URL to fetch the command or configuration remotely
 		RemoteSource string `yaml:"remoteSource,omitempty"`

+		// FetchBeforeExecution determines if the remoteSource should be fetched before running
 		FetchBeforeExecution bool `yaml:"fetchBeforeExecution,omitempty"`

-		Fetcher remotefetcher.RemoteFetcher
-
 		// BEGIN USER COMMAND FIELDS

+		// Username specifies the username for user creation or related operations
 		Username string `yaml:"userName,omitempty"`

 		UserID string `yaml:"userID,omitempty"`

+		// UserGroups specifies the groups to add the user to
 		UserGroups []string `yaml:"userGroups,omitempty"`

+		// UserHome specifies the home directory for the user
 		UserHome string `yaml:"userHome,omitempty"`

+		// UserShell specifies the shell for the user
 		UserShell string `yaml:"userShell,omitempty"`

-		UserCreateHome bool `yaml:"userCreateHome,omitempty"`
-
-		UserIsSystem bool `yaml:"userIsSystem,omitempty"`
+		// SystemUser specifies whether the user is a system account
+		SystemUser bool `yaml:"systemUser,omitempty"`

+		// UserPassword specifies the password for the user (can be file: or plain text)
 		UserPassword string `yaml:"userPassword,omitempty"`

-		UserSshPubKeys []string `yaml:"userSshPubKeys,omitempty"`
-
 		userMan usermanager.UserManager

 		// OS for the command, only used when type is user
 		OS string `yaml:"OS,omitempty"`

+		// UserOperation specifies the action for user-related commands (e.g., "create" or "remove")
 		UserOperation string `yaml:"userOperation,omitempty"`

 		userCmdSet bool
@ -136,7 +152,7 @@ type (
 		// stdin only for userOperation = password (for now)
 		stdin *strings.Reader

-		// END USER STRUCommandType FIELDS
+		// END USER STRUCT FIELDS
 	}

 	RemoteSource struct {
@ -151,17 +167,13 @@ type (
 	BackyOptionFunc func(*ConfigOpts)

 	CmdList struct {
-		Name                                     string   `yaml:"name,omitempty"`
-		Cron                                     string   `yaml:"cron,omitempty"`
-		RunCmdOnFailure                          string   `yaml:"runCmdOnFailure,omitempty"`
-		Order                                    []string `yaml:"order,omitempty"`
-		Notifications                            []string `yaml:"notifications,omitempty"`
-		GetCommandOutputInNotificationsOnSuccess bool     `yaml:"sendNotificationOnSuccess,omitempty"`
-
-		Notify struct {
-			OnFailure bool `yaml:"onFailure,omitempty"`
-			OnSuccess bool `yaml:"onSuccess,omitempty"`
-		} `yaml:"notify,omitempty"`
+		Name            string   `yaml:"name,omitempty"`
+		Cron            string   `yaml:"cron,omitempty"`
+		RunCmdOnFailure string   `yaml:"runCmdOnFailure,omitempty"`
+		Order           []string `yaml:"order,omitempty"`
+		Notifications   []string `yaml:"notifications,omitempty"`
+		GetOutput       bool     `yaml:"getOutput,omitempty"`
+		NotifyOnSuccess bool     `yaml:"notifyOnSuccess,omitempty"`

 		NotifyConfig *notify.Notify
 		Source       string `yaml:"source"` // URL to fetch remote commands
@ -175,7 +187,7 @@ type (

 		// CmdConfigLists holds the lists of commands to be run in order.
 		// Key is the command list name.
-		CmdConfigLists map[string]*CmdList `yaml:"cmdLists"`
+		CmdConfigLists map[string]*CmdList `yaml:"cmd-lists"`

 		// Hosts holds the Host config.
 		// key is the host.
@ -186,16 +198,13 @@ type (
 		// Global log level
 		BackyLogLvl *string

-		CmdStdOut bool
-
+		// Holds config file
 		ConfigFilePath string

-		HostsFilePath string
-
-		ConfigDir string
-
+		// Holds log file
 		LogFilePath string

+		// for command list file
 		CmdListFile string

 		// use command lists using cron
@ -212,8 +221,6 @@ type (

 		List ListConfig

-		Vars map[string]string `yaml:"variables"`
-
 		VaultKeys []*VaultKey `yaml:"keys"`

 		koanf *koanf.Koanf
@ -232,7 +239,6 @@ type (

 	VaultKey struct {
 		Name      string `yaml:"name"`
-		Key       string `yaml:"key"`
 		Path      string `yaml:"path"`
 		ValueType string `yaml:"type"`
 		MountPath string `yaml:"mountpath"`
@ -248,7 +254,6 @@ type (
 	Notifications struct {
 		MailConfig   map[string]MailConfig   `yaml:"mail,omitempty"`
 		MatrixConfig map[string]MatrixStruct `yaml:"matrix,omitempty"`
-		HttpConfig   map[string]HttpConfig   `yaml:"http,omitempty"`
 	}

 	CmdOutput struct {
@ -283,56 +288,4 @@ type (
 		ListName string // Name of the command list
 		Error    error  // Error encountered, if any
 	}
-
-	ListMetrics struct {
-		Name                 string
-		SuccessfulExecutions uint64
-		FailedExecutions     uint64
-		TotalExecutions      uint64
-	}
-
-	CommandMetrics struct {
-		Name                 string
-		SuccessfulExecutions uint64
-		FailedExecutions     uint64
-		TotalExecutions      uint64
-	}
-
-	// use ints so we can use enums
-	CommandType               int
-	PackageOperation          int
-	AllowedExternalDirectives int
-)
-
-//go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=CommandType
-const (
-	DefaultCommandType      CommandType = iota //
-	ScriptCommandType                          // script
-	ScriptFileCommandType                      // scriptFile
-	RemoteScriptCommandType                    // remoteScript
-	PackageCommandType                         // package
-	UserCommandType                            // user
-)
-
-//go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=PackageOperation
-const (
-	DefaultPO                    PackageOperation = iota //
-	PackageOperationInstall                              // install
-	PackageOperationUpgrade                              // upgrade
-	PackageOperationPurge                                // purge
-	PackageOperationRemove                               // remove
-	PackageOperationCheckVersion                         // checkVersion
-	PackageOperationIsInstalled                          // isInstalled
-)
-
-//go:generate go run github.com/dmarkham/enumer -linecomment -yaml -text -json -type=AllowedExternalDirectives
-const (
-	DefaultExternalDir                AllowedExternalDirectives = iota
-	AllowedExternalDirectiveVault                               // vault
-	AllowedExternalDirectiveVaultEnv                            // vault-env
-	AllowedExternalDirectiveVaultFile                           // vault-file
-	AllowedExternalDirectiveAll                                 // vault-file-env
-	AllowedExternalDirectiveFileEnv                             // file-env
-	AllowedExternalDirectiveFile                                // file
-	AllowedExternalDirectiveEnv                                 // env
 )
--- a/pkg/backy/utils.go
+++ b/pkg/backy/utils.go
@ -6,19 +6,15 @@ package backy

 import (
 	"bytes"
-	"context"
 	"errors"
 	"fmt"
 	"os"
 	"os/exec"
 	"path"
 	"path/filepath"
-	"regexp"
 	"strings"

 	"git.andrewnw.xyz/CyberShell/backy/pkg/logging"
-	"git.andrewnw.xyz/CyberShell/backy/pkg/remotefetcher"
-	vault "github.com/hashicorp/vault/api"
 	"github.com/joho/godotenv"
 	"github.com/knadh/koanf/v2"
 	"github.com/rs/zerolog"
@ -68,19 +64,6 @@ func SetLogFile(logFile string) BackyOptionFunc {
 	}
 }

-func SetHostsConfigFile(hostsConfigFile string) BackyOptionFunc {
-	return func(bco *ConfigOpts) {
-		bco.HostsFilePath = hostsConfigFile
-	}
-}
-
-// EnableCommandStdOut forces the command output to stdout
-func EnableCommandStdOut(setStdOut bool) BackyOptionFunc {
-	return func(bco *ConfigOpts) {
-		bco.CmdStdOut = setStdOut
-	}
-}
-
 // EnableCron enables the execution of command lists at specified times
 func EnableCron() BackyOptionFunc {
 	return func(bco *ConfigOpts) {
@ -88,7 +71,7 @@ func EnableCron() BackyOptionFunc {
 	}
 }

-func NewConfigOptions(configFilePath string, opts ...BackyOptionFunc) *ConfigOpts {
+func NewOpts(configFilePath string, opts ...BackyOptionFunc) *ConfigOpts {
 	b := &ConfigOpts{}
 	b.ConfigFilePath = configFilePath
 	for _, opt := range opts {
@ -101,7 +84,7 @@ func NewConfigOptions(configFilePath string, opts ...BackyOptionFunc) *ConfigOpt

 func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, opts *ConfigOpts, log zerolog.Logger) {
 	if envVarsToInject.file != "" {
-		envPath, envPathErr := getFullPathWithHomeDir(envVarsToInject.file)
+		envPath, envPathErr := resolveDir(envVarsToInject.file)
 		if envPathErr != nil {
 			log.Fatal().Str("envFile", envPath).Err(envPathErr).Send()
 		}
@ -117,11 +100,7 @@ func injectEnvIntoSSH(envVarsToInject environmentVars, process *ssh.Session, opt
 			goto errEnvFile
 		}
 		for key, val := range envMap {
-			err = process.Setenv(key, getExternalConfigDirectiveValue(val, opts, AllowedExternalDirectiveVault))
-			if err != nil {
-				log.Error().Err(err).Send()
-
-			}
+			process.Setenv(key, GetVaultKey(val, opts, log))
 		}
 	}

@ -132,17 +111,14 @@ errEnvFile:
 		if strings.Contains(envVal, "=") {
 			envVarArr := strings.Split(envVal, "=")

-			err := process.Setenv(envVarArr[0], getExternalConfigDirectiveValue(envVarArr[1], opts, AllowedExternalDirectiveVaultFile))
-			if err != nil {
-				log.Error().Err(err).Send()
-			}
+			process.Setenv(envVarArr[0], GetVaultKey(envVarArr[1], opts, log))
 		}
 	}
 }

-func injectEnvIntoLocalCMD(envVarsToInject environmentVars, process *exec.Cmd, log zerolog.Logger, opts *ConfigOpts) {
+func injectEnvIntoLocalCMD(envVarsToInject environmentVars, process *exec.Cmd, log zerolog.Logger) {
 	if envVarsToInject.file != "" {
-		envPath, _ := getFullPathWithHomeDir(envVarsToInject.file)
+		envPath, _ := resolveDir(envVarsToInject.file)

 		file, fileErr := os.Open(envPath)
 		if fileErr != nil {
@ -164,8 +140,7 @@ errEnvFile:

 	for _, envVal := range envVarsToInject.env {
 		if strings.Contains(envVal, "=") {
-			envVarArr := strings.Split(envVal, "=")
-			process.Env = append(process.Env, fmt.Sprintf("%s=%s", envVarArr[0], getExternalConfigDirectiveValue(envVarArr[1], opts, AllowedExternalDirectiveVault)))
+			process.Env = append(process.Env, envVal)
 		}
 	}
 	process.Env = append(process.Env, os.Environ()...)
@ -198,6 +173,7 @@ func testFile(c string) error {
 			return fileOpenErr
 		}
 	}
+
 	return nil
 }

@ -206,12 +182,10 @@ func IsTerminalActive() bool {
 }

 func IsCmdStdOutEnabled() bool {
-	return os.Getenv("BACKY_CMDSTDOUT") == "enabled"
+	return os.Getenv("BACKY_STDOUT") == "enabled"
 }

-func getFullPathWithHomeDir(path string) (string, error) {
-	path = strings.TrimSpace(path)
-
+func resolveDir(path string) (string, error) {
 	if path == "~" {
 		homeDir, err := os.UserHomeDir()
 		if err != nil {
@ -233,39 +207,21 @@ func getFullPathWithHomeDir(path string) (string, error) {

 // loadEnv loads a .env file from the config file directory
 func (opts *ConfigOpts) loadEnv() {
+	envFileInConfigDir := fmt.Sprintf("%s/.env", path.Dir(opts.ConfigFilePath))
 	var backyEnv map[string]string
-	var envFileInConfigDir string
-	var envFileErr error
-	if isRemoteURL(opts.ConfigFilePath) {
-		_, u := getRemoteDir(opts.ConfigFilePath)
-		envFileInConfigDir = u.JoinPath(".env").String()
-		envFetcher, err := remotefetcher.NewRemoteFetcher(envFileInConfigDir, opts.Cache)
-		if err != nil {
-			return
-		}
-		data, err := envFetcher.Fetch(envFileInConfigDir)
-		if err != nil {
-			return
-		}
-		backyEnv, envFileErr = godotenv.UnmarshalBytes(data)
-		if envFileErr != nil {
-			return
-		}
-
-	} else {
-		envFileInConfigDir = fmt.Sprintf("%s/.env", path.Dir(opts.ConfigFilePath))
-		backyEnv, envFileErr = godotenv.Read(envFileInConfigDir)
-		if envFileErr != nil {
-			return
-		}
+	backyEnv, envFileErr := godotenv.Read(envFileInConfigDir)
+	if envFileErr != nil {
+		return
 	}

 	opts.backyEnv = backyEnv
 }

+// expandEnvVars expands environment variables with the env used in the config
 func expandEnvVars(backyEnv map[string]string, envVars []string) {

 	env := func(name string) string {
+		name = strings.ToUpper(name)
 		envVar, found := backyEnv[name]
 		if found {
 			return envVar
@ -273,35 +229,39 @@ func expandEnvVars(backyEnv map[string]string, envVars []string) {
 		return ""
 	}

+	// parse env variables using new macros
 	for indx, v := range envVars {
-
-		if strings.HasPrefix(v, envExternDirectiveStart) && strings.HasSuffix(v, externDirectiveEnd) {
-			v = strings.TrimPrefix(v, envExternDirectiveStart)
-			v = strings.TrimRight(v, externDirectiveEnd)
-			out, _ := shell.Expand(v, env)
-			envVars[indx] = out
+		if strings.HasPrefix(v, macroStart) && strings.HasSuffix(v, macroEnd) {
+			if strings.HasPrefix(v, envMacroStart) {
+				v = strings.TrimPrefix(v, envMacroStart)
+				v = strings.TrimRight(v, macroEnd)
+				out, _ := shell.Expand(v, env)
+				envVars[indx] = out
+			}
 		}
-
 	}
 }

-func getCommandTypeAndSetCommandInfo(command *Command) *Command {
+// getCommandType checks for command type and if the command has already been set
+// Checks for types package and user
+// Returns the modified Command with the package- or userManager command as Cmd and the package- or userOperation as args, plus any additional Args
+func getCommandType(command *Command) *Command {

-	if command.Type == PackageCommandType && !command.packageCmdSet {
+	if command.Type == "package" && !command.packageCmdSet {
 		command.packageCmdSet = true
 		switch command.PackageOperation {
-		case PackageOperationInstall:
-			command.Cmd, command.Args = command.pkgMan.Install(command.Packages, command.Args)
-		case PackageOperationRemove:
-			command.Cmd, command.Args = command.pkgMan.Remove(command.Packages, command.Args)
-		case PackageOperationUpgrade:
-			command.Cmd, command.Args = command.pkgMan.Upgrade(command.Packages)
-		case PackageOperationCheckVersion:
-			command.Cmd, command.Args = command.pkgMan.CheckVersion(command.Packages)
+		case "install":
+			command.Cmd, command.Args = command.pkgMan.Install(command.PackageName, command.PackageVersion, command.Args)
+		case "remove":
+			command.Cmd, command.Args = command.pkgMan.Remove(command.PackageName, command.Args)
+		case "upgrade":
+			command.Cmd, command.Args = command.pkgMan.Upgrade(command.PackageName, command.PackageVersion)
+		case "checkVersion":
+			command.Cmd, command.Args = command.pkgMan.CheckVersion(command.PackageName, command.PackageVersion)
 		}
 	}

-	if command.Type == UserCommandType && !command.userCmdSet {
+	if command.Type == "user" && !command.userCmdSet {
 		command.userCmdSet = true
 		switch command.UserOperation {
 		case "add":
@ -309,8 +269,7 @@ func getCommandTypeAndSetCommandInfo(command *Command) *Command {
 				command.Username,
 				command.UserHome,
 				command.UserShell,
-				command.UserIsSystem,
-				command.UserCreateHome,
+				command.SystemUser,
 				command.UserGroups,
 				command.Args)
 		case "modify":
@ -333,188 +292,33 @@ func getCommandTypeAndSetCommandInfo(command *Command) *Command {

 func parsePackageVersion(output string, cmdCtxLogger zerolog.Logger, command *Command, cmdOutBuf bytes.Buffer) ([]string, error) {

-	var errs []error
-	pkgVersionOnSystem, errs := command.pkgMan.ParseRemotePackageManagerVersionOutput(output)
-	if errs != nil {
-		cmdCtxLogger.Error().Errs("Error parsing package version output", errs).Send()
-		return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error parsing package version output: %v", errs)
-	}
-
-	for _, p := range pkgVersionOnSystem {
-		packageIndex := getPackageIndexFromCommand(command, p.Name)
-		if packageIndex == -1 {
-			cmdCtxLogger.Error().Str("package", p.Name).Msg("Package not found in command")
-			continue
-		}
-		command.Packages[packageIndex].VersionCheck = p.VersionCheck
-		packageFromCommand := command.Packages[packageIndex]
-		cmdCtxLogger.Info().
-			Str("Installed", packageFromCommand.VersionCheck.Installed).
-			Msg("Package version comparison")
-
-		versionLogger := cmdCtxLogger.With().Str("package", packageFromCommand.Name).Logger()
-
-		if packageFromCommand.Version != "" {
-			versionLogger := cmdCtxLogger.With().Str("package", packageFromCommand.Name).Str("Specified Version", packageFromCommand.Version).Logger()
-			packageVersionRegex, PkgRegexErr := regexp.Compile(packageFromCommand.Version)
-			if PkgRegexErr != nil {
-				versionLogger.Error().Err(PkgRegexErr).Msg("Error compiling package version regex")
-				errs = append(errs, PkgRegexErr)
-				continue
-			}
-			if p.Version == packageFromCommand.Version {
-				versionLogger.Info().Msgf("Installed version matches specified version: %s", packageFromCommand.Version)
-			} else if packageVersionRegex.MatchString(p.VersionCheck.Installed) {
-				versionLogger.Info().Msgf("Installed version contains specified version: %s", packageFromCommand.Version)
-			} else {
-				versionLogger.Info().Msg("Installed version does not match specified version")
-				errs = append(errs, fmt.Errorf("installed version of %s does not match specified version: %s", packageFromCommand.Name, packageFromCommand.Version))
-			}
-		} else {
-			if p.VersionCheck.Installed == p.VersionCheck.Candidate {
-				versionLogger.Info().Msg("Installed and Candidate versions match")
-			} else {
-				cmdCtxLogger.Info().Msg("Installed and Candidate versions differ")
-				errs = append(errs, errors.New("installed and Candidate versions differ"))
-			}
-		}
-	}
-	if errs == nil {
-		return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), nil
-	}
-	return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.Output.ToLog), fmt.Errorf("error parsing package version output: %v", errs)
-}
-
-func getPackageIndexFromCommand(command *Command, name string) int {
-	for i, v := range command.Packages {
-		if name == v.Name {
-			return i
-		}
-	}
-
-	return -1
-}
-
-func getExternalConfigDirectiveValue(key string, opts *ConfigOpts, allowedDirectives AllowedExternalDirectives) string {
-	if !(strings.HasPrefix(key, externDirectiveStart) && strings.HasSuffix(key, externDirectiveEnd)) {
-		return key
-	}
-	key = replaceVarInString(opts.Vars, key, opts.Logger)
-	opts.Logger.Debug().Str("expanding external key", key).Send()
-
-	if strings.HasPrefix(key, envExternDirectiveStart) {
-		if IsExternalDirectiveEnv(allowedDirectives) {
-
-			key = strings.TrimPrefix(key, envExternDirectiveStart)
-			key = strings.TrimSuffix(key, externDirectiveEnd)
-			key = os.Getenv(key)
-		} else {
-			opts.Logger.Error().Msgf("Config key with value %s does not support env directive", key)
-		}
-	}
-
-	if strings.HasPrefix(key, externFileDirectiveStart) {
-		if IsExternalDirectiveFile(allowedDirectives) {
-
-			var err error
-			var keyValue []byte
-			key = strings.TrimPrefix(key, externFileDirectiveStart)
-			key = strings.TrimSuffix(key, externDirectiveEnd)
-			key, err = getFullPathWithHomeDir(key)
-			if err != nil {
-				opts.Logger.Err(err).Send()
-				return ""
-			}
-			if !path.IsAbs(key) {
-				key = path.Join(opts.ConfigDir, key)
-			}
-			keyValue, err = os.ReadFile(key)
-			if err != nil {
-				opts.Logger.Err(err).Send()
-				return ""
-			}
-			key = string(keyValue)
-		} else {
-			opts.Logger.Error().Msgf("Config key with value %s does not support file directive", key)
-		}
-	}
-
-	if strings.HasPrefix(key, vaultExternDirectiveStart) {
-		if IsExternalDirectiveVault(allowedDirectives) {
-
-			key = strings.TrimPrefix(key, vaultExternDirectiveStart)
-			key = strings.TrimSuffix(key, externDirectiveEnd)
-			key = GetVaultKey(key, opts, opts.Logger)
-		} else {
-			opts.Logger.Error().Msgf("Config key with value %s does not support vault directive", key)
-		}
-	}
-
-	return key
-}
-
-func getVaultSecret(vaultClient *vault.Client, key *VaultKey) (string, error) {
-	var (
-		secret *vault.KVSecret
-		err    error
-	)
-
-	if key.ValueType == "KVv2" {
-		secret, err = vaultClient.KVv2(key.MountPath).Get(context.Background(), key.Path)
-	} else if key.ValueType == "KVv1" {
-		secret, err = vaultClient.KVv1(key.MountPath).Get(context.Background(), key.Path)
-	} else if key.ValueType != "" {
-		return "", fmt.Errorf("type %s for key %s not known. Valid types are KVv1 or KVv2", key.ValueType, key.Name)
-	} else {
-		return "", fmt.Errorf("type for key %s must be specified. Valid types are KVv1 or KVv2", key.Name)
-	}
+	var err error
+	pkgVersion, err := command.pkgMan.Parse(output)
+	// println(output)
 	if err != nil {
-		return "", fmt.Errorf("unable to read secret: %v", err)
+		cmdCtxLogger.Error().Err(err).Str("package", command.PackageName).Msg("Error parsing package version output")
+		return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, command.GetOutput), err
 	}

-	value, ok := secret.Data[key.Key].(string)
-	if !ok {
-		return "", fmt.Errorf("value type assertion failed for vault key %s: %T %#v", key.Name, secret.Data[key.Name], secret.Data[key.Name])
-	}
+	cmdCtxLogger.Info().
+		Str("Installed", pkgVersion.Installed).
+		Str("Candidate", pkgVersion.Candidate).
+		Msg("Package version comparison")

-	return value, nil
-}
-
-func getVaultKeyData(keyName string, keys []*VaultKey) (*VaultKey, error) {
-	for _, k := range keys {
-		if k.Name == keyName {
-			return k, nil
+	if command.PackageVersion != "" {
+		if pkgVersion.Installed == command.PackageVersion {
+			cmdCtxLogger.Info().Msgf("Installed version matches specified version: %s", command.PackageVersion)
+		} else {
+			cmdCtxLogger.Info().Msgf("Installed version does not match specified version: %s", command.PackageVersion)
+			err = fmt.Errorf("Installed version does not match specified version: %s", command.PackageVersion)
+		}
+	} else {
+		if pkgVersion.Installed == pkgVersion.Candidate {
+			cmdCtxLogger.Info().Msg("Installed and Candidate versions match")
+		} else {
+			cmdCtxLogger.Info().Msg("Installed and Candidate versions differ")
+			err = errors.New("Installed and Candidate versions differ")
 		}
 	}
-	return nil, fmt.Errorf("key %s not found in vault keys", keyName)
-}
-
-func GetVaultKey(str string, opts *ConfigOpts, log zerolog.Logger) string {
-	key, err := getVaultKeyData(str, opts.VaultKeys)
-	if key == nil && err == nil {
-		return str
-	}
-	if err != nil && key == nil {
-		log.Err(err).Send()
-		return ""
-	}
-
-	value, secretErr := getVaultSecret(opts.vaultClient, key)
-	if secretErr != nil {
-		log.Err(secretErr).Send()
-		return value
-	}
-	return value
-}
-
-func IsExternalDirectiveFile(allowedExternalDirectives AllowedExternalDirectives) bool {
-	return strings.Contains(allowedExternalDirectives.String(), "file")
-}
-
-func IsExternalDirectiveEnv(allowedExternalDirectives AllowedExternalDirectives) bool {
-	return strings.Contains(allowedExternalDirectives.String(), "env")
-}
-
-func IsExternalDirectiveVault(allowedExternalDirectives AllowedExternalDirectives) bool {
-	return strings.Contains(allowedExternalDirectives.String(), "vault")
+	return collectOutput(&cmdOutBuf, command.Name, cmdCtxLogger, false), err
 }
--- a/pkg/pkgman/apt/apt.go
+++ b/pkg/pkgman/apt/apt.go
@ -1,19 +1,18 @@
 package apt

 import (
-	"bufio"
-	"bytes"
 	"fmt"
+	"regexp"
 	"strings"

-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
 )

 // AptManager implements PackageManager for systems using APT.
 type AptManager struct {
 	useAuth     bool   // Whether to use an authentication command
 	authCommand string // The authentication command, e.g., "sudo"
-	Parser      packagemanagercommon.PackageParser
+	Parser      pkgcommon.PackageParser
 }

 // DefaultAuthCommand is the default command used for authentication.
@ -30,13 +29,14 @@ func NewAptManager() *AptManager {
 }

 // Install returns the command and arguments for installing a package.
-func (a *AptManager) Install(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (a *AptManager) Install(pkg, version string, args []string) (string, []string) {
 	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
 	baseArgs := []string{"update", "&&", baseCmd, "install", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s=%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
@ -44,34 +44,31 @@ func (a *AptManager) Install(pkgs []packagemanagercommon.Package, args []string)
 }

 // Remove returns the command and arguments for removing a package.
-func (a *AptManager) Remove(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (a *AptManager) Remove(pkg string, args []string) (string, []string) {
 	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
-	baseArgs := []string{"remove", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
+	baseArgs := []string{"remove", "-y", pkg}
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
 	return baseCmd, baseArgs
 }

-func (a *AptManager) Upgrade(pkgs []packagemanagercommon.Package) (string, []string) {
+// Upgrade returns the command and arguments for upgrading a specific package.
+func (a *AptManager) Upgrade(pkg, version string) (string, []string) {
 	baseCmd := a.prependAuthCommand(DefaultPackageCommand)
 	baseArgs := []string{"update", "&&", baseCmd, "install", "--only-upgrade", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s=%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	return baseCmd, baseArgs
 }

-func (a *AptManager) CheckVersion(pkgs []packagemanagercommon.Package) (string, []string) {
+// CheckVersion returns the command and arguments for checking the info of a specific package.
+func (a *AptManager) CheckVersion(pkg, version string) (string, []string) {
 	baseCmd := a.prependAuthCommand("apt-cache")
-	baseArgs := []string{"policy"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
+	baseArgs := []string{"policy", pkg}

 	return baseCmd, baseArgs
 }
@ -84,7 +81,7 @@ func (a *AptManager) UpgradeAll() (string, []string) {
 }

 // Configure applies functional options to customize the package manager.
-func (a *AptManager) Configure(options ...packagemanagercommon.PackageManagerOption) {
+func (a *AptManager) Configure(options ...pkgcommon.PackageManagerOption) {
 	for _, opt := range options {
 		opt(a)
 	}
@ -109,56 +106,25 @@ func (a *AptManager) SetAuthCommand(authCommand string) {
 }

 // Parse parses the apt-cache policy output to extract Installed and Candidate versions.
-func (a *AptManager) ParseRemotePackageManagerVersionOutput(output string) ([]packagemanagercommon.Package, []error) {
-	var (
-		packageName        string
-		installedString    string
-		candidateString    string
-		countRelevantLines int
-	)
+func (a *AptManager) Parse(output string) (*pkgcommon.PackageVersion, error) {
 	// Check for error message in the output
 	if strings.Contains(output, "Unable to locate package") {
-		return nil, []error{fmt.Errorf("error: %s", strings.TrimSpace(output))}
-	}
-	packages := []packagemanagercommon.Package{}
-	outputBuf := bytes.NewBufferString(output)
-	outputScan := bufio.NewScanner(outputBuf)
-	for outputScan.Scan() {
-		line := outputScan.Text()
-		if !strings.HasPrefix(line, "  ") && strings.HasSuffix(line, ":") {
-			// count++
-			packageName = strings.TrimSpace(strings.TrimSuffix(line, ":"))
-		}
-		if strings.Contains(line, "Installed:") {
-			countRelevantLines++
-			installedString = strings.TrimPrefix(strings.TrimSpace(line), "Installed:")
-		}
-
-		if strings.Contains(line, "Candidate:") {
-			countRelevantLines++
-			candidateString = strings.TrimPrefix(strings.TrimSpace(line), "Candidate:")
-		}
-
-		if countRelevantLines == 2 {
-			countRelevantLines = 0
-			packages = append(packages, packagemanagercommon.Package{
-				Name: packageName,
-				VersionCheck: packagemanagercommon.PackageVersion{
-					Installed: strings.TrimSpace(installedString),
-					Candidate: strings.TrimSpace(candidateString),
-					Match:     installedString == candidateString,
-				}},
-			)
-		}
+		return nil, fmt.Errorf("error: %s", strings.TrimSpace(output))
 	}

-	return packages, nil
-}
+	reInstalled := regexp.MustCompile(`Installed:\s*([^\s]+)`)
+	reCandidate := regexp.MustCompile(`Candidate:\s*([^\s]+)`)

-func SearchPackages(pkgs []string, version string) (string, []string) {
-	baseCommand := "dpkg-query"
-	baseArgs := []string{"-W", "-f='${Package}\t${Architecture}\t${db:Status-Status}\t${Version}\t${Installed-Size}\t${Binary:summary}\n'"}
-	baseArgs = append(baseArgs, pkgs...)
+	installedMatch := reInstalled.FindStringSubmatch(output)
+	candidateMatch := reCandidate.FindStringSubmatch(output)

-	return baseCommand, baseArgs
+	if len(installedMatch) < 2 || len(candidateMatch) < 2 {
+		return nil, fmt.Errorf("failed to parse Installed or Candidate versions from apt output. check package name")
+	}
+
+	return &pkgcommon.PackageVersion{
+		Installed: strings.TrimSpace(installedMatch[1]),
+		Candidate: strings.TrimSpace(candidateMatch[1]),
+		Match:     installedMatch[1] == candidateMatch[1],
+	}, nil
 }
--- a/pkg/pkgman/dnf/dnf.go
+++ b/pkg/pkgman/dnf/dnf.go
@ -5,7 +5,7 @@ import (
 	"regexp"
 	"strings"

-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
 )

 // DnfManager implements PackageManager for systems using YUM.
@ -26,21 +26,21 @@ func NewDnfManager() *DnfManager {
 }

 // Configure applies functional options to customize the package manager.
-func (y *DnfManager) Configure(options ...packagemanagercommon.PackageManagerOption) {
+func (y *DnfManager) Configure(options ...pkgcommon.PackageManagerOption) {
 	for _, opt := range options {
 		opt(y)
 	}
 }

 // Install returns the command and arguments for installing a package.
-func (y *DnfManager) Install(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (y *DnfManager) Install(pkg, version string, args []string) (string, []string) {
 	baseCmd := y.prependAuthCommand("dnf")
 	baseArgs := []string{"install", "-y"}
-
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
@ -48,13 +48,9 @@ func (y *DnfManager) Install(pkgs []packagemanagercommon.Package, args []string)
 }

 // Remove returns the command and arguments for removing a package.
-func (y *DnfManager) Remove(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (y *DnfManager) Remove(pkg string, args []string) (string, []string) {
 	baseCmd := y.prependAuthCommand("dnf")
-	baseArgs := []string{"remove", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
-
+	baseArgs := []string{"remove", "-y", pkg}
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
@ -62,41 +58,38 @@ func (y *DnfManager) Remove(pkgs []packagemanagercommon.Package, args []string)
 }

 // Upgrade returns the command and arguments for upgrading a specific package.
-func (y *DnfManager) Upgrade(pkgs []packagemanagercommon.Package) (string, []string) {
+func (y *DnfManager) Upgrade(pkg, version string) (string, []string) {
 	baseCmd := y.prependAuthCommand("dnf")
 	baseArgs := []string{"update", "-y"}
-
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	return baseCmd, baseArgs
 }

 // UpgradeAll returns the command and arguments for upgrading all packages.
 func (y *DnfManager) UpgradeAll() (string, []string) {
 	baseCmd := y.prependAuthCommand("dnf")
-	baseArgs := []string{"upgrade", "-y"}
+	baseArgs := []string{"update", "-y"}
 	return baseCmd, baseArgs
 }

 // CheckVersion returns the command and arguments for checking the info of a specific package.
-func (d *DnfManager) CheckVersion(pkgs []packagemanagercommon.Package) (string, []string) {
+func (d *DnfManager) CheckVersion(pkg, version string) (string, []string) {
 	baseCmd := d.prependAuthCommand("dnf")
-	baseArgs := []string{"info"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
+	baseArgs := []string{"info", pkg}

 	return baseCmd, baseArgs
 }

 // Parse parses the dnf info output to extract Installed and Candidate versions.
-func (d DnfManager) ParseRemotePackageManagerVersionOutput(output string) ([]packagemanagercommon.Package, []error) {
+func (d DnfManager) Parse(output string) (*pkgcommon.PackageVersion, error) {

 	// Check for error message in the output
 	if strings.Contains(output, "No matching packages to list") {
-		return nil, []error{fmt.Errorf("error: package not listed")}
+		return nil, fmt.Errorf("error: package not listed")
 	}

 	// Define regular expressions to capture installed and available versions
@ -118,10 +111,13 @@ func (d DnfManager) ParseRemotePackageManagerVersionOutput(output string) ([]pac
 	}

 	if installedVersion == "" && candidateVersion == "" {
-		return nil, []error{fmt.Errorf("failed to parse versions from dnf output")}
+		return nil, fmt.Errorf("failed to parse versions from dnf output")
 	}

-	return nil, nil
+	return &pkgcommon.PackageVersion{
+		Installed: installedVersion,
+		Candidate: candidateVersion,
+	}, nil
 }

 // prependAuthCommand prepends the authentication command if UseAuth is true.
--- a/pkg/pkgman/pkgcommon/options.go
+++ b/pkg/pkgman/pkgcommon/options.go
@ -1,4 +1,4 @@
-package packagemanagercommon
+package pkgcommon

 // PackageManagerOption defines a functional option for configuring a PackageManager.
 type PackageManagerOption func(interface{})
@ -15,9 +15,3 @@ type PackageVersion struct {
 	Match     bool
 	Message   string
 }
-
-type Package struct {
-	Name         string `yaml:"name"`
-	Version      string `yaml:"version,omitempty"`
-	VersionCheck PackageVersion
-}
--- a/pkg/pkgman/pkgman.go
+++ b/pkg/pkgman/pkgman.go
@ -4,26 +4,26 @@ import (
 	"fmt"

 	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/apt"
-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
 	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/dnf"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
 	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/yum"
 )

 // PackageManager is an interface used to define common package commands. This shall be implemented by every package.
 type PackageManager interface {
-	Install(pkgs []packagemanagercommon.Package, args []string) (string, []string)
-	Remove(pkgs []packagemanagercommon.Package, args []string) (string, []string)
-	Upgrade(pkgs []packagemanagercommon.Package) (string, []string) // Upgrade a specific package
+	Install(pkg, version string, args []string) (string, []string)
+	Remove(pkg string, args []string) (string, []string)
+	Upgrade(pkg, version string) (string, []string) // Upgrade a specific package
 	UpgradeAll() (string, []string)
-	CheckVersion(pkgs []packagemanagercommon.Package) (string, []string)
-	ParseRemotePackageManagerVersionOutput(output string) ([]packagemanagercommon.Package, []error)
+	CheckVersion(pkg, version string) (string, []string)
+	Parse(output string) (*pkgcommon.PackageVersion, error)
 	// Configure applies functional options to customize the package manager.
-	Configure(options ...packagemanagercommon.PackageManagerOption)
+	Configure(options ...pkgcommon.PackageManagerOption)
 }

 // PackageManagerFactory returns the appropriate PackageManager based on the package tool.
 // Takes variable number of options.
-func PackageManagerFactory(managerType string, options ...packagemanagercommon.PackageManagerOption) (PackageManager, error) {
+func PackageManagerFactory(managerType string, options ...pkgcommon.PackageManagerOption) (PackageManager, error) {
 	var manager PackageManager

 	switch managerType {
@ -43,7 +43,7 @@ func PackageManagerFactory(managerType string, options ...packagemanagercommon.P
 }

 // WithAuth enables authentication and sets the authentication command.
-func WithAuth(authCommand string) packagemanagercommon.PackageManagerOption {
+func WithAuth(authCommand string) pkgcommon.PackageManagerOption {
 	return func(manager interface{}) {
 		if configurable, ok := manager.(interface {
 			SetUseAuth(bool)
@ -56,7 +56,7 @@ func WithAuth(authCommand string) packagemanagercommon.PackageManagerOption {
 }

 // WithoutAuth disables authentication.
-func WithoutAuth() packagemanagercommon.PackageManagerOption {
+func WithoutAuth() pkgcommon.PackageManagerOption {
 	return func(manager interface{}) {
 		if configurable, ok := manager.(interface {
 			SetUseAuth(bool)
@ -68,8 +68,8 @@ func WithoutAuth() packagemanagercommon.PackageManagerOption {

 // ConfigurablePackageManager defines methods for setting configuration options.
 type ConfigurablePackageManager interface {
-	packagemanagercommon.PackageParser
+	pkgcommon.PackageParser
 	SetUseAuth(useAuth bool)
 	SetAuthCommand(authCommand string)
-	SetPackageParser(parser packagemanagercommon.PackageParser)
+	SetPackageParser(parser pkgcommon.PackageParser)
 }
--- a/pkg/pkgman/yum/yum.go
+++ b/pkg/pkgman/yum/yum.go
@ -3,9 +3,8 @@ package yum
 import (
 	"fmt"
 	"regexp"
-	"strings"

-	packagemanagercommon "git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/common"
+	"git.andrewnw.xyz/CyberShell/backy/pkg/pkgman/pkgcommon"
 )

 // YumManager implements PackageManager for systems using YUM.
@ -26,20 +25,21 @@ func NewYumManager() *YumManager {
 }

 // Configure applies functional options to customize the package manager.
-func (y *YumManager) Configure(options ...packagemanagercommon.PackageManagerOption) {
+func (y *YumManager) Configure(options ...pkgcommon.PackageManagerOption) {
 	for _, opt := range options {
 		opt(y)
 	}
 }

 // Install returns the command and arguments for installing a package.
-func (y *YumManager) Install(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (y *YumManager) Install(pkg, version string, args []string) (string, []string) {
 	baseCmd := y.prependAuthCommand("yum")
 	baseArgs := []string{"install", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
@ -47,13 +47,9 @@ func (y *YumManager) Install(pkgs []packagemanagercommon.Package, args []string)
 }

 // Remove returns the command and arguments for removing a package.
-func (y *YumManager) Remove(pkgs []packagemanagercommon.Package, args []string) (string, []string) {
+func (y *YumManager) Remove(pkg string, args []string) (string, []string) {
 	baseCmd := y.prependAuthCommand("yum")
-	baseArgs := []string{"remove", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
-
+	baseArgs := []string{"remove", "-y", pkg}
 	if args != nil {
 		baseArgs = append(baseArgs, args...)
 	}
@ -61,13 +57,14 @@ func (y *YumManager) Remove(pkgs []packagemanagercommon.Package, args []string)
 }

 // Upgrade returns the command and arguments for upgrading a specific package.
-func (y *YumManager) Upgrade(pkgs []packagemanagercommon.Package) (string, []string) {
+func (y *YumManager) Upgrade(pkg, version string) (string, []string) {
 	baseCmd := y.prependAuthCommand("yum")
 	baseArgs := []string{"update", "-y"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
+	if version != "" {
+		baseArgs = append(baseArgs, fmt.Sprintf("%s-%s", pkg, version))
+	} else {
+		baseArgs = append(baseArgs, pkg)
 	}
-
 	return baseCmd, baseArgs
 }

@ -79,27 +76,17 @@ func (y *YumManager) UpgradeAll() (string, []string) {
 }

 // CheckVersion returns the command and arguments for checking the info of a specific package.
-func (y *YumManager) CheckVersion(pkgs []packagemanagercommon.Package) (string, []string) {
+func (y *YumManager) CheckVersion(pkg, version string) (string, []string) {
 	baseCmd := y.prependAuthCommand("yum")
-	baseArgs := []string{"info"}
-	for _, p := range pkgs {
-		baseArgs = append(baseArgs, p.Name)
-	}
+	baseArgs := []string{"info", pkg}

 	return baseCmd, baseArgs
 }

 // Parse parses the dnf info output to extract Installed and Candidate versions.
-func (y YumManager) ParseRemotePackageManagerVersionOutput(output string) ([]packagemanagercommon.Package, []error) {
-
-	// Check for error message in the output
-	if strings.Contains(output, "No matching packages to list") {
-		return nil, []error{fmt.Errorf("error: package not listed")}
-	}
-
-	// Define regular expressions to capture installed and available versions
-	reInstalled := regexp.MustCompile(`(?m)^Installed packages\s*Name\s*:\s*\S+\s*Epoch\s*:\s*\S+\s*Version\s*:\s*([^\s]+)\s*Release\s*:\s*([^\s]+)`)
-	reAvailable := regexp.MustCompile(`(?m)^Available packages\s*Name\s*:\s*\S+\s*Epoch\s*:\s*\S+\s*Version\s*:\s*([^\s]+)\s*Release\s*:\s*([^\s]+)`)
+func (y YumManager) Parse(output string) (*pkgcommon.PackageVersion, error) {
+	reInstalled := regexp.MustCompile(`(?m)^Installed Packages\s*Name\s*:\s*\S+\s*Version\s*:\s*([^\s]+)\s*Release\s*:\s*([^\s]+)`)
+	reAvailable := regexp.MustCompile(`(?m)^Available Packages\s*Name\s*:\s*\S+\s*Version\s*:\s*([^\s]+)\s*Release\s*:\s*([^\s]+)`)

 	installedMatch := reInstalled.FindStringSubmatch(output)
 	candidateMatch := reAvailable.FindStringSubmatch(output)
@ -116,10 +103,13 @@ func (y YumManager) ParseRemotePackageManagerVersionOutput(output string) ([]pac
 	}

 	if installedVersion == "" && candidateVersion == "" {
-		return nil, []error{fmt.Errorf("failed to parse versions from dnf output")}
+		return nil, fmt.Errorf("failed to parse versions from dnf output")
 	}

-	return nil, nil
+	return &pkgcommon.PackageVersion{
+		Installed: installedVersion,
+		Candidate: candidateVersion,
+	}, nil
 }

 // prependAuthCommand prepends the authentication command if UseAuth is true.
--- a/pkg/remotefetcher/cache.go
+++ b/pkg/remotefetcher/cache.go
@ -6,7 +6,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"path"
 	"path/filepath"
 	"sync"

@ -17,7 +16,6 @@ type CacheData struct {
 	Hash string `yaml:"hash"`
 	Path string `yaml:"path"`
 	Type string `yaml:"type"`
-	URL  string `yaml:"url"`
 }

 type Cache struct {
@ -73,7 +71,7 @@ func (c *Cache) saveToFile() error {
 	for _, data := range c.store {
 		cacheData = append(cacheData, data)
 	}
-	cacheData = unique(cacheData)
+
 	data, err := yaml.Marshal(cacheData)
 	if err != nil {
 		return err
@ -103,20 +101,16 @@ func (c *Cache) AddDataToStore(hash string, cacheData CacheData) error {
 	return c.saveToFile()
 }

-// Set stores data on disk and in the cache file and returns the cache data
-// The filepath of the data is the file name + a SHA256 hash of the URL
 func (c *Cache) Set(source, hash string, data []byte, dataType string) (CacheData, error) {
 	c.mu.Lock()
 	defer c.mu.Unlock()

-	sourceHash := HashURL(source)
-
 	fileName := filepath.Base(source)

-	path := filepath.Join(c.dir, fmt.Sprintf("%s-%s", fileName, sourceHash))
+	path := filepath.Join(c.dir, fmt.Sprintf("%s-%s", fileName, hash))

 	if _, err := os.Stat(path); os.IsNotExist(err) {
-		_ = os.MkdirAll(c.dir, 0700)
+		os.MkdirAll(c.dir, 0700)
 	}

 	err := os.WriteFile(path, data, 0644)
@ -128,10 +122,9 @@ func (c *Cache) Set(source, hash string, data []byte, dataType string) (CacheDat
 		Hash: hash,
 		Path: path,
 		Type: dataType,
-		URL:  sourceHash,
 	}

-	c.store[sourceHash] = cacheData
+	c.store[hash] = cacheData

 	// Unlock before calling saveToFile to avoid double-locking
 	c.mu.Unlock()
@ -171,7 +164,6 @@ func (cf *CachedFetcher) Hash(data []byte) string {
 func LoadMetadataFromFile(filePath string) ([]*CacheData, error) {
 	if _, err := os.Stat(filePath); os.IsNotExist(err) {
 		// Create the file if it does not exist
-		_ = os.MkdirAll(path.Dir(filePath), 0700)
 		emptyData := []byte("[]")
 		err := os.WriteFile(filePath, emptyData, 0644)
 		if err != nil {
@ -186,35 +178,9 @@ func LoadMetadataFromFile(filePath string) ([]*CacheData, error) {

 	var cacheData []*CacheData
 	err = yaml.Unmarshal(data, &cacheData)
-
 	if err != nil {
 		return nil, err
 	}

 	return cacheData, nil
 }
-
-func HashURL(url string) string {
-	hash := sha256.Sum256([]byte(url))
-	return hex.EncodeToString(hash[:])
-}
-
-func unique(cache []CacheData) []CacheData {
-	var unique []CacheData
-	type key struct{ value1, value2, value3, value4 string }
-	m := make(map[key]int)
-	for _, v := range cache {
-		k := key{v.URL, v.Hash, v.Path, v.Type}
-		if i, ok := m[k]; ok {
-			// Overwrite previous value per requirement in
-			// question to keep last matching value.
-			unique[i] = v
-		} else {
-			// Unique key found. Record position and collect
-			// in result.
-			m[k] = len(unique)
-			unique = append(unique, v)
-		}
-	}
-	return unique
-}
--- a/pkg/remotefetcher/configfetcher.go
+++ b/pkg/remotefetcher/configfetcher.go
@ -29,7 +29,7 @@ func NewRemoteFetcher(source string, cache *Cache, options ...FetcherOption) (Re
 		option(&config)
 	}

-	// WithFileType was not called. yaml is the default file type
+	// If FileType is empty (i.e. WithFileType was not called), yaml is the default file type
 	if strings.TrimSpace(config.FileType) == "" {
 		config.FileType = "yaml"
 	}
@ -57,13 +57,11 @@ func NewRemoteFetcher(source string, cache *Cache, options ...FetcherOption) (Re
 		return nil, err
 	}

-	URLHash := HashURL(source)
-	if cachedData, cacheMeta, exists := cache.Get(URLHash); exists {
-		println(cachedData)
+	hash := fetcher.Hash(data)
+	if cachedData, cacheMeta, exists := cache.Get(hash); exists {
 		return &CachedFetcher{data: cachedData, path: cacheMeta.Path, dataType: cacheMeta.Type}, nil
 	}

-	hash := fetcher.Hash(data)
 	cacheData, err := cache.Set(source, hash, data, config.FileType)
 	if err != nil {
 		return nil, err
--- a/pkg/remotefetcher/local.go
+++ b/pkg/remotefetcher/local.go
@ -20,7 +20,7 @@ func (l *LocalFetcher) Fetch(source string) ([]byte, error) {
 		if l.config.IgnoreFileNotFound {
 			return nil, ErrIgnoreFileNotFound
 		}
-		return nil, err
+		return nil, nil
 	}
 	file, err := os.Open(source)
 	if err != nil {
--- a/pkg/remotefetcher/s3.go
+++ b/pkg/remotefetcher/s3.go
@ -44,11 +44,11 @@ func NewS3Fetcher(endpoint string, options ...FetcherOption) (*S3Fetcher, error)
 	*/

 	s3Endpoint := os.Getenv("S3_ENDPOINT")
-	creds, err := getS3Credentials(os.Getenv("AWS_PROFILE"), s3Endpoint, cfg.HTTPClient)
+	creds, err := getS3Credentials("default", s3Endpoint, cfg.HTTPClient)
 	if err != nil {
+		println(err.Error())
 		return nil, err
 	}
-
 	// Initialize S3 client if not provided
 	if cfg.S3Client == nil {
 		s3Client, err = minio.New(s3Endpoint, &minio.Options{
@ -128,11 +128,12 @@ func (s *S3Fetcher) Hash(data []byte) string {
 }

 func getS3Credentials(profile, host string, httpClient *http.Client) (*credentials.Credentials, error) {
+	// println(s3utils.GetRegionFromURL(*u))
 	homeDir, hdirErr := homedir.Dir()
 	if hdirErr != nil {
 		return nil, hdirErr
 	}
-	s3Creds := credentials.NewFileAWSCredentials(path.Join(homeDir, ".aws", "credentials"), profile)
+	s3Creds := credentials.NewFileAWSCredentials(path.Join(homeDir, ".aws", "credentials"), "default")
 	credVals, credErr := s3Creds.GetWithContext(&credentials.CredContext{Endpoint: host, Client: httpClient})
 	if credErr != nil {
 		return nil, credErr
--- a/pkg/usermanager/linux/linux.go
+++ b/pkg/usermanager/linux/linux.go
@ -15,7 +15,7 @@ func (l LinuxUserManager) NewLinuxManager() *LinuxUserManager {
 }

 // AddUser adds a new user to the system.
-func (l LinuxUserManager) AddUser(username, homeDir, shell string, isSystem, createHome bool, groups, args []string) (string, []string) {
+func (l LinuxUserManager) AddUser(username, homeDir, shell string, isSystem bool, groups, args []string) (string, []string) {
 	baseArgs := []string{}

 	if isSystem {
@ -38,10 +38,6 @@ func (l LinuxUserManager) AddUser(username, homeDir, shell string, isSystem, cre
 		baseArgs = append(baseArgs, args...)
 	}

-	if createHome {
-		baseArgs = append(baseArgs, "-m")
-	}
-
 	args = append(baseArgs, username)

 	cmd := "useradd"
--- a/pkg/usermanager/userman.go
+++ b/pkg/usermanager/userman.go
@ -10,7 +10,7 @@ import (
 // UserManager defines the interface for user management operations.
 // All functions but one return a string for the command and any args.
 type UserManager interface {
-	AddUser(username, homeDir, shell string, createHome, isSystem bool, groups, args []string) (string, []string)
+	AddUser(username, homeDir, shell string, isSystem bool, groups, args []string) (string, []string)
 	RemoveUser(username string) (string, []string)
 	ModifyUser(username, homeDir, shell string, groups []string) (string, []string)
 	// Modify password uses chpasswd for Linux systems to build the command to change the password
--- a/9
+++ b/9
@ -1,14 +1,9 @@
 #!/bin/bash
-set -eou pipefail
-go mod tidy
-go generate ./...
-CURRENT_TAG="$(go run backy.go version -V)"
-goreleaser -f .goreleaser/github.yml check
-goreleaser -f .goreleaser/gitea.yml check
+export CURRENT_TAG="$(go run backy.go version -V)"
 changie batch $CURRENT_TAG
 changie merge
 git add .changes/
-git commit -am "$CURRENT_TAG"
+git commit =am "$CURRENT_TAG"
 git tag "$CURRENT_TAG"
 git push all
 git push all --tags
--- a/tests/.gitignore
+++ b/tests/.gitignore
@ -1 +0,0 @@
-private
--- a/tests/ErrorHook.yml
+++ b/tests/ErrorHook.yml
@ -1,32 +0,0 @@
-commands:
-  echoTestFail:
-    cmd: ech
-    shell: bash
-    Args: 
-      - hello world
-    hooks:
-      error:
-        - errorCmd
-      final:
-        - finalCmd
-  
-  finalCmd:
-    cmd: echo
-    Args:
-      - "echo test fail"
-
-  errorCmd:
-    name: get docker version
-    cmd: docker
-    getOutput: true
-    outputToLog: true
-    Args:
-      - "-v"
-    host: email-svr
-
-cmdLists:
-  TestHooks:
-    output:
-      onFailure: true
-    order:
-      - echoTestFail
--- a/tests/HookNotInFile.yaml
+++ b/tests/HookNotInFile.yaml
@ -1,14 +0,0 @@
-commands:
-  echoTestFail:
-    cmd: ech
-    shell: bash
-    Args: hello world
-    hooks:
-      error:
-        - errorCm # 
-
-  errorCmd:
-    name: get docker version
-    cmd: docker
-    Args:
-      - "-v"
--- a/tests/SuccessHook.yml
+++ b/tests/SuccessHook.yml
@ -1,16 +0,0 @@
-commands:
-  echoTestSuccess:
-    cmd: echo
-    shell: bash
-    Args: hello world
-    hooks:
-      success:
-        - successCmd
-
-  errorCmd:
-    name: get docker version
-    cmd: docker
-    getOutput: true
-    outputToLog: true
-    Args:
-      - "-v"
--- a/tests/VaultTest.yml
+++ b/tests/VaultTest.yml
@ -1,27 +0,0 @@
-commands:
-  vaultEnvVar:
-    cmd: echo
-    shell: /bin/zsh
-    Args:
-      - ${VAULT_VAR}
-    environment:
-      "VAULT_VAR=%{vault:vaultTestSecret}%"
-
-logging:
-  verbose: true
-
-vault:
-  token: root
-  address: http://127.0.0.1:8200
-  enabled: true
-  keys:
-    - name: vaultTestSecret
-      key: data
-      mountpath: secret
-      path: test/var
-      type: KVv2 # KVv1 or KVv2
-
-cmdLists:
-  addUsers:
-    order:
-      - vaultEnvVar
--- a/tests/docker/Dockerfile
+++ b/tests/docker/Dockerfile
@ -1,26 +0,0 @@
-FROM debian:buster
-
-# Install SSH server
-RUN apt-get update && \
-    apt-get install -y openssh-server && \
-    apt-get clean
-
-RUN sed -i 's/PermitRootLogin prohibit-password/PermitRootLogin yes/' /etc/ssh/sshd_config
-
-RUN sed -i 's/#PasswordAuthentication yes/PasswordAuthentication yes/' /etc/ssh/sshd_config
-
-RUN useradd -m -s /bin/bash backy
-RUN echo "backy:backy" | chpasswd
-RUN echo "root:test" | chpasswd
-COPY --chown=backy:backy backytest.pub /home/backy/.ssh/authorized_keys
-COPY --chown=root:root backytest.pub /root/.ssh/authorized_keys
-
-EXPOSE 22
-RUN mkdir /var/run/sshd
-RUN chmod 0755 /var/run/sshd
-
-# RUN apt-get update && apt-get install -y 
-
-# Start SSH service
-CMD ["/usr/sbin/sshd", "-D"]
-# ENTRYPOINT service ssh start && bash
--- a/tests/docker/backytest
+++ b/tests/docker/backytest
@ -1,7 +0,0 @@
-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACBtBASN+HMx/EVUIs5ThK9Nlw0wPFVt2rXsiNZlDN+CswAAAKAfFc5AHxXO
-QAAAAAtzc2gtZWQyNTUxOQAAACBtBASN+HMx/EVUIs5ThK9Nlw0wPFVt2rXsiNZlDN+Csw
-AAAEAxs6uRkenVbXPrjgbIv/1THXL6dUdgr5KaCd7uBVm0PW0EBI34czH8RVQizlOEr02X
-DTA8VW3ateyI1mUM34KzAAAAGU1lZGlhIHVzZXIgc3RvcmFnZSBzZXJ2ZXIBAgME
-----END OPENSSH PRIVATE KEY-----
--- a/Show More
+++ b/Show More