diff --git a/.github/workflows/update-stores.yml b/.github/workflows/update-stores.yml
new file mode 100644
index 00000000..3d50e2f2
--- /dev/null
+++ b/.github/workflows/update-stores.yml
@@ -0,0 +1,197 @@
+name: Create Cert Store Update Pull Request
+
+on:
+  repository_dispatch:
+    types: targetRepo-event
+  workflow_dispatch:
+    inputs:
+      targetRepo:
+        description: 'Target repository for workflow_dispatch'
+        default: 'all'
+      targetRef:
+        description: 'Target ref for workflow_dispatch'
+        default: 'latest'
+
+jobs:
+  create_pull_request:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Set TARGET_REPO_BRANCH from workflow_dispatch input
+        if: github.event_name == 'workflow_dispatch'
+        id: set-local-env-vars
+        run: |
+          echo "TARGET_REPO_BRANCH=${{ inputs.targetRef }}" | tee -a $GITHUB_ENV
+          echo "KFUTIL_ARG=${{ inputs.targetRepo }}" | tee -a $GITHUB_ENV
+      - name: Set TARGET_REPO_BRANCH from repository_dispatch input
+        if: github.event_name == 'repository_dispatch'
+        id: set-env-vars-from-payload
+        run: |
+          echo "TARGET_REPO_BRANCH=${{ github.event.client_payload.targetRef }}" | tee -a $GITHUB_ENV
+          echo "KFUTIL_ARG=${{ github.event.client_payload.targetRepo }}" | tee -a $GITHUB_ENV
+      - name: Check Open PRs for Existing Branch
+        id: check-branch
+        uses: actions/github-script@v6
+        with:
+          script: |
+            // Look for open pull requests
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const pulls = await github.rest.pulls.list({
+              owner,
+              repo,
+              state: "open"
+            });
+            // Filter out ones matching the KFUTIL_ARG from payload (repository_dispatch) or input (workflow_dispatch)
+            const filteredData = pulls.data.filter(item => item.head.ref === '${{ env.KFUTIL_ARG }}'); // Look for an existing branch with the orchestrator repo name
+            const isBranch = (filteredData.length > 0)
+            if (isBranch) {
+              const {
+                head: { ref: incomingBranch }, base: { ref: baseBranch }
+              } = pulls.data[0]
+              core.setOutput('PR_BRANCH', 'commit'); // Just commit since the branch exists
+              console.log(`incomingBranch: ${incomingBranch}`)
+              console.log(`baseBranch: ${baseBranch}`)
+            } else {
+              core.setOutput('PR_BRANCH', 'create') // No branch, create one
+            }
+            console.log(`Branch exists?`)
+            console.log(filteredData.length > 0)
+            console.log(`targetRepo: ${{env.KFUTIL_ARG}}`)
+      - name: set env.PR_BRANCH value for jobs
+        run: |
+          echo "PR_BRANCH=${{steps.check-branch.outputs.PR_BRANCH}}" | tee -a $GITHUB_ENV
+
+# If the branch with an open PR already exists, first check out that branch from kfutil 
+      - name: Check out existing repo merge branch
+        if: env.PR_BRANCH == 'commit'
+        uses: actions/checkout@v4
+        with:
+          repository: 'keyfactor/kfutil'
+          sparse-checkout: |
+            .github
+          path: './merge-folder/'
+          token: ${{ secrets.SDK_SYNC_PAT }}
+          ref: '${{env.KFUTIL_ARG}}' 
+
+# If the branch does not exist, first check out the main branch from kfutil. 
+      - name: Check out main
+        if: env.PR_BRANCH == 'create'
+        uses: actions/checkout@v4
+        with:
+          repository: 'keyfactor/kfutil'
+          sparse-checkout: |
+            .github
+          path: './merge-folder/'
+          token: ${{ secrets.SDK_SYNC_PAT }}
+
+# Save a copy of the original json
+      - name: Save original store_types.json
+        run: |
+          echo "Saving original store_types.json as store_types.sav.json"
+          cp ./merge-folder/store_types.json  ./merge-folder/store_types.sav.json
+
+# Checkout and run the python tool
+      - name: Check out python merge tool repo
+        uses: actions/checkout@v4
+        with:
+          repository: 'keyfactor/integration-tools'
+          path: './tools/'
+          token: ${{ secrets.SDK_SYNC_PAT }}
+
+      - name: Run Python Script
+        working-directory: ./tools/store-type-merge
+        run: |
+          python main.py --repo-name ${{ env.KFUTIL_ARG }} --ref ${{ env.TARGET_REPO_BRANCH }}
+          cat store_types.json
+        env:
+          GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
+
+      - name: Save Store Types JSON Artifact
+        if: success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: store-types  
+          path: |
+              ./tools/store-type-merge/store_types.json 
+              ./merge-folder/store_types.sav.json
+
+      - name: Save Invalid Store Types JSON Artifact
+        if: success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: invalid-repos 
+          path: ./tools/store-type-merge/invalid_repos.json  
+
+      - name: Save logs directory
+        if: success()
+        uses: actions/upload-artifact@v3
+        with:
+          name: logs 
+          path: ./tools/store-type-merge/log 
+
+# Copy the result to the pr commit folder
+      - name: Copy store-type-merge results
+        run: |
+          echo "Saving original store_types.json as store_types.sav.json"
+          cp -f ./tools/store-type-merge/store_types.json  ./merge-folder/store_types.json
+
+# Diff the new json against the saved copy and set an UPDATE_FILE variable
+      - name: Diff the results
+        run: |
+          echo "Diff the results"
+          echo "Set UPDATE_FILE=1 if differences"
+          if cmp -s ./merge-folder/store_types.json ./merge-folder/store_types.sav.json ; 
+            then echo "UPDATE_FILE=F" | tee -a $GITHUB_ENV; 
+            else echo "UPDATE_FILE=T" | tee -a $GITHUB_ENV; 
+          fi
+          diff ./merge-folder/store_types.json ./merge-folder/store_types.sav.json || true
+
+#  There are two different steps with a condition to check the PR_BRANCH env var
+#  Both steps will contain a check for the UPDATE_FILE variable before running
+      - name: Add and Commit to newly created branch
+        if: ${{ env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'create' }}
+        uses: Keyfactor/add-and-commit@v9.1.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          add: store_types.json --force
+          message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
+          author_name: Keyfactor
+          author_email: keyfactor@keyfactor.github.io
+          cwd: './merge-folder/'
+          new_branch: ${{env.KFUTIL_ARG}}
+
+      - name: Add and Commit to existing branch
+        if: ${{ env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'commit' }}
+        uses: Keyfactor/add-and-commit@v9.1.3
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          add: store_types.json --force
+          message: Update store_types.json for ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}
+          author_name: Keyfactor
+          author_email: keyfactor@keyfactor.github.io
+          cwd: './merge-folder/'
+
+      - name: Create new PR for the newly created branch
+        if: env.UPDATE_FILE == 'T' && env.PR_BRANCH == 'create'
+        uses: actions/github-script@v6
+        with:
+          script: |
+            console.log(`Created ${{env.KFUTIL_ARG}} `)
+            console.log("Commit to ${{env.KFUTIL_ARG}} for PR")
+            const owner = context.repo.owner;
+            const repo = context.repo.repo;
+            const baseBranch = 'main'; 
+            const newBranch = '${{env.KFUTIL_ARG}}'; 
+            const response = await github.rest.pulls.create({
+              owner,
+              repo,
+              title: 'New Pull Request - ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}}',
+              head: newBranch,
+              base: baseBranch,
+              body: 'The cert store update from ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}} needs to be verified and merged if correct.',
+            });
+            console.log(`Pull request created: ${{env.KFUTIL_ARG}}:${{env.TARGET_REPO_BRANCH}} : ${response.data.html_url}`);
+        env:
+          GITHUB_TOKEN: ${{ secrets.SDK_SYNC_PAT }}
diff --git a/store_types.json b/store_types.json
index b2e8dc3b..91704774 100644
--- a/store_types.json
+++ b/store_types.json
@@ -1,13 +1,9 @@
 [
   {
-    "Name": "RFPkcs12",
-    "ShortName": "RFPkcs12",
-    "Capability": "RFPkcs12",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
+    "Name": "Azure Keyvault",
+    "ShortName": "AKV",
+    "Capability": "AKV",
+    "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
       "Create": true,
@@ -15,72 +11,57 @@
       "Enrollment": false,
       "Remove": true
     },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
     "Properties": [
       {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
+        "Name": "VaultName",
+        "DisplayName": "VaultName",
+        "Type": "String",
         "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
+      {
+        "Name": "ResourceGroupName",
+        "DisplayName": "ResourceGroupName",
         "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "SampleStoreType",
-    "ShortName": "SAMPLETYPE",
-    "Capability": "SAMPLETYPE",
-    "SupportedOperations": {
-      "Add": false,
-      "Create": false,
-      "Discovery": false,
-      "Enrollment": false,
-      "Remove": false
-    },
-    "Properties": [],
-    "EntryParameters": [],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Forbidden",
-    "JobProperties": [],
-    "ServerRequired": false,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden"
-  },
-  {
-    "Name": "WinCerMgmt",
-    "ShortName": "WinCerMgmt",
-    "Capability": "WinCerMgmt",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": false,
-      "Discovery": false,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
       {
-        "Name": "spnwithport",
-        "DisplayName": "spnwithport",
-        "Type": "Bool",
+        "Name": "SkuType",
+        "DisplayName": "SKU Type",
+        "Type": "MultipleChoice",
         "DependsOn": "",
-        "DefaultValue": "false",
+        "DefaultValue": "standard,premium",
+        "Required": false
+      },
+      {
+        "Name": "VaultRegion",
+        "DisplayName": "Vault Region",
+        "Type": "MultipleChoice",
+        "DependsOn": "",
+        "DefaultValue": "eastus,eastus2,westus2,westus3,westus",
+        "Required": false
+      },
+      {
+        "Name": "AzureCloud",
+        "DisplayName": "Azure Cloud",
+        "Type": "MultipleChoice",
+        "DependsOn": "",
+        "DefaultValue": "public,china,germany,government",
+        "Required": false
+      },
+      {
+        "Name": "PrivateEndpoint",
+        "DisplayName": "Private KeyVault Endpoint",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
         "Required": false
       }
     ],
-    "EntryParameters": [],
+    "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
@@ -93,38 +74,41 @@
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden"
+    "CustomAliasAllowed": "Optional"
   },
   {
-    "Name": "K8SCluster",
-    "ShortName": "K8SCluster",
-    "Capability": "K8SCluster",
+    "Name": "Azure Application (Auth)",
+    "ShortName": "AzureApp",
+    "Capability": "AzureApp",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
-      "Create": true,
-      "Discovery": false,
+      "Create": false,
+      "Discovery": true,
       "Enrollment": false,
       "Remove": true
     },
     "Properties": [
       {
+        "StoreTypeId": 279,
         "Name": "ServerUsername",
         "DisplayName": "Server Username",
         "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": null,
+        "DefaultValue": "",
         "Required": false
       },
       {
+        "StoreTypeId": 279,
         "Name": "ServerPassword",
         "DisplayName": "Server Password",
         "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
+        "DefaultValue": "",
+        "Required": false
       },
       {
+        "StoreTypeId": 279,
         "Name": "ServerUseSsl",
         "DisplayName": "Use SSL",
         "Type": "Bool",
@@ -133,15 +117,13 @@
         "Required": true
       }
     ],
-    "EntryParameters": null,
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
+    "PrivateKeyAllowed": "Forbidden",
     "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
@@ -149,87 +131,31 @@
     "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "K8SJKS",
-    "ShortName": "K8SJKS",
-    "Capability": "K8SJKS",
+    "Name": "Azure Application Gateway",
+    "ShortName": "AzureAppGW",
+    "Capability": "AzureAppGW",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
-      "Create": true,
+      "Create": false,
       "Discovery": true,
       "Enrollment": false,
       "Remove": true
     },
     "Properties": [
-      {
-        "Name": "KubeNamespace",
-        "DisplayName": "KubeNamespace",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "default",
-        "Required": false
-      },
-      {
-        "Name": "KubeSecretName",
-        "DisplayName": "KubeSecretName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "KubeSecretType",
-        "DisplayName": "KubeSecretType",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "jks",
-        "Required": true
-      },
-      {
-        "Name": "CertificateDataFieldName",
-        "DisplayName": "CertificateDataFieldName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "PasswordFieldName",
-        "DisplayName": "PasswordFieldName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "password",
-        "Required": false
-      },
-      {
-        "Name": "PasswordIsK8SSecret",
-        "DisplayName": "PasswordIsK8SSecret",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": false
-      },
-      {
-        "Name": "StorePasswordPath",
-        "DisplayName": "StorePasswordPath",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      },
       {
         "Name": "ServerUsername",
         "DisplayName": "Server Username",
         "Type": "Secret",
-        "DependsOn": "",
+        "DependsOn": null,
         "DefaultValue": null,
-        "Required": false
+        "Required": true
       },
       {
         "Name": "ServerPassword",
         "DisplayName": "Server Password",
         "Type": "Secret",
-        "DependsOn": "",
+        "DependsOn": null,
         "DefaultValue": null,
         "Required": true
       },
@@ -237,64 +163,70 @@
         "Name": "ServerUseSsl",
         "DisplayName": "Use SSL",
         "Type": "Bool",
-        "DependsOn": "",
+        "DependsOn": null,
         "DefaultValue": "true",
-        "Required": true
+        "Required": false
+      }
+    ],
+    "EntryParameters": [
+      {
+        "Name": "HTTPListenerName",
+        "DisplayName": "HTTP Listener Name",
+        "Type": "String",
+        "RequiredWhen": {
+          "HasPrivateKey": false,
+          "OnAdd": false,
+          "OnRemove": false,
+          "OnReenrollment": false
+        }
       }
     ],
-    "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
-      "StoreRequired": true,
+      "StoreRequired": false,
       "Style": "Default"
     },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
+    "PrivateKeyAllowed": "Required",
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required"
+    "CustomAliasAllowed": "Required",
+    "ServerRegistration": 13,
+    "InventoryEndpoint": "/AnyInventory/Update"
   },
   {
-    "Name": "K8SNS",
-    "ShortName": "K8SNS",
-    "Capability": "K8SNS",
+    "Name": "Azure Service Principal (SSO/SAML)",
+    "ShortName": "AzureSP",
+    "Capability": "AzureSP",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
-      "Create": true,
+      "Create": false,
       "Discovery": true,
       "Enrollment": false,
       "Remove": true
     },
     "Properties": [
       {
-        "Name": "KubeNamespace",
-        "DisplayName": "Kube Namespace",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "default",
-        "Required": false
-      },
-      {
+        "StoreTypeId": 280,
         "Name": "ServerUsername",
         "DisplayName": "Server Username",
         "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": null,
+        "DefaultValue": "",
         "Required": false
       },
       {
+        "StoreTypeId": 280,
         "Name": "ServerPassword",
         "DisplayName": "Server Password",
         "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
+        "DefaultValue": "",
+        "Required": false
       },
       {
+        "StoreTypeId": 280,
         "Name": "ServerUseSsl",
         "DisplayName": "Use SSL",
         "Type": "Bool",
@@ -303,15 +235,13 @@
         "Required": true
       }
     ],
-    "EntryParameters": null,
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
+    "PrivateKeyAllowed": "Required",
     "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
@@ -319,9 +249,33 @@
     "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "K8SPKCS12",
-    "ShortName": "K8SPKCS12",
-    "Capability": "K8SPKCS12",
+    "Name": "Fortigate",
+    "ShortName": "Fortigate",
+    "Capability": "Fortigate",
+    "ServerRequired": false,
+    "BlueprintAllowed": true,
+    "CustomAliasAllowed": "Required",
+    "PowerShell": false,
+    "PrivateKeyAllowed": "Required",
+    "SupportedOperations": {
+      "Add": true,
+      "Create": false,
+      "Discovery": true,
+      "Enrollment": false,
+      "Remove": true
+    },
+    "PasswordOptions": {
+      "Style": "Default",
+      "EntrySupported": false,
+      "StoreRequired": true
+    },
+    "Properties": [],
+    "EntryParameters": []
+  },
+  {
+    "Name": "Hashicorp Vault Key-Value",
+    "ShortName": "HCVKV",
+    "Capability": "HCVKV",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
@@ -332,204 +286,113 @@
     },
     "Properties": [
       {
-        "Name": "KubeSecretKey",
-        "DisplayName": "Kube Secret Key",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "pfx",
-        "Required": false
-      },
-      {
-        "Name": "PasswordFieldName",
-        "DisplayName": "Password Field Name",
+        "Name": "MountPoint",
+        "DisplayName": "Mount Point",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": "password",
-        "Required": false
-      },
-      {
-        "Name": "PasswordIsK8SSecret",
-        "DisplayName": "Password Is K8S Secret",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "false",
+        "DefaultValue": null,
         "Required": false
       },
       {
-        "Name": "KubeNamespace",
-        "DisplayName": "Kube Namespace",
+        "Name": "VaultToken",
+        "DisplayName": "Vault Token",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": "default",
+        "DefaultValue": null,
         "Required": false
       },
       {
-        "Name": "KubeSecretName",
-        "DisplayName": "Kube Secret Name",
+        "Name": "VaultServerUrl",
+        "DisplayName": "Vault Server URL",
         "Type": "String",
         "DependsOn": "",
         "DefaultValue": null,
         "Required": false
       },
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
+        "Name": "SubfolderInventory",
+        "DisplayName": "Subfolder Inventory",
+        "Type": "Bool",
         "DependsOn": "",
-        "DefaultValue": null,
+        "DefaultValue": "false",
         "Required": false
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "IncludeCertChain",
+        "DisplayName": "Include Cert Chain",
         "Type": "Bool",
         "DependsOn": "",
         "DefaultValue": "true",
-        "Required": true
-      },
-      {
-        "Name": "KubeSecretType",
-        "DisplayName": "Kube Secret Type",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "pkcs12",
-        "Required": true
-      },
-      {
-        "Name": "StorePasswordPath",
-        "DisplayName": "StorePasswordPath",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
         "Required": false
       }
     ],
     "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
-      "StoreRequired": true,
+      "StoreRequired": false,
       "Style": "Default"
     },
     "StorePathType": "",
     "StorePathValue": "",
     "PrivateKeyAllowed": "Optional",
     "JobProperties": [],
-    "ServerRequired": true,
+    "ServerRequired": false,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required"
+    "CustomAliasAllowed": "Optional"
   },
   {
-    "Name": "Windows Certificate",
-    "ShortName": "WinCert",
-    "Capability": "WinCert",
+    "Name": "Hashicorp Vault PKI",
+    "ShortName": "HCVPKI",
+    "Capability": "HCVPKI",
     "LocalStore": false,
     "SupportedOperations": {
-      "Add": true,
+      "Add": false,
       "Create": false,
       "Discovery": false,
-      "Enrollment": true,
-      "Remove": true
+      "Enrollment": false,
+      "Remove": false
     },
     "Properties": [
       {
-        "Name": "spnwithport",
-        "DisplayName": "SPN With Port",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": false
-      },
-      {
-        "Name": "WinRM Protocol",
-        "DisplayName": "WinRM Protocol",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "https,http",
-        "Required": true
-      },
-      {
-        "Name": "WinRM Port",
-        "DisplayName": "WinRM Port",
+        "Name": "MountPoint",
+        "DisplayName": "Mount Point",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": "5986",
-        "Required": true
-      },
-      {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": "",
         "DefaultValue": null,
-        "Required": false
+        "Required": true
       },
       {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
+        "Name": "VaultToken",
+        "DisplayName": "VaultToken",
+        "Type": "String",
         "DependsOn": "",
         "DefaultValue": null,
-        "Required": false
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
-        "Type": "Bool",
-        "DependsOn": "",
-        "DefaultValue": "true",
         "Required": true
-      }
-    ],
-    "EntryParameters": [
-      {
-        "Name": "ProviderName",
-        "DisplayName": "Crypto Provider Name",
-        "Type": "String",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": false
-        },
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Options": ""
       },
       {
-        "Name": "SAN",
-        "DisplayName": "SAN",
+        "Name": "VaultServerUrl",
+        "DisplayName": "Vault Server URL",
         "Type": "String",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": true
-        },
         "DependsOn": "",
-        "DefaultValue": "",
-        "Options": ""
+        "DefaultValue": null,
+        "Required": false
       }
     ],
+    "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
+    "StorePathType": "",
     "StorePathValue": "",
-    "PrivateKeyAllowed": "Required",
-    "ServerRequired": true,
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
+    "ServerRequired": false,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden"
+    "CustomAliasAllowed": "Optional"
   },
   {
     "Name": "IIS Bound Certificate",
@@ -720,57 +583,65 @@
     "CustomAliasAllowed": "Forbidden"
   },
   {
-    "Name": "Hashicorp Vault Key-Value",
-    "ShortName": "HCVKV",
-    "Capability": "HCVKV",
+    "Name": "K8SCert",
+    "ShortName": "K8SCert",
+    "Capability": "K8SCert",
     "LocalStore": false,
     "SupportedOperations": {
-      "Add": true,
-      "Create": true,
+      "Add": false,
+      "Create": false,
       "Discovery": true,
       "Enrollment": false,
-      "Remove": true
+      "Remove": false
     },
     "Properties": [
       {
-        "Name": "MountPoint",
-        "DisplayName": "Mount Point",
+        "Name": "KubeNamespace",
+        "DisplayName": "KubeNamespace",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": null,
+        "DefaultValue": "default",
         "Required": false
       },
       {
-        "Name": "VaultToken",
-        "DisplayName": "Vault Token",
+        "Name": "KubeSecretName",
+        "DisplayName": "KubeSecretName",
         "Type": "String",
         "DependsOn": "",
         "DefaultValue": null,
         "Required": false
       },
       {
-        "Name": "VaultServerUrl",
-        "DisplayName": "Vault Server URL",
+        "Name": "KubeSecretType",
+        "DisplayName": "KubeSecretType",
         "Type": "String",
         "DependsOn": "",
+        "DefaultValue": "cert",
+        "Required": true
+      },
+      {
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
+        "DependsOn": "",
         "DefaultValue": null,
         "Required": false
       },
       {
-        "Name": "SubfolderInventory",
-        "DisplayName": "Subfolder Inventory",
-        "Type": "Bool",
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": false
+        "DefaultValue": null,
+        "Required": true
       },
       {
-        "Name": "IncludeCertChain",
-        "DisplayName": "Include Cert Chain",
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
         "Type": "Bool",
         "DependsOn": "",
         "DefaultValue": "true",
-        "Required": false
+        "Required": true
       }
     ],
     "EntryParameters": null,
@@ -781,49 +652,49 @@
     },
     "StorePathType": "",
     "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
+    "PrivateKeyAllowed": "Forbidden",
     "JobProperties": [],
-    "ServerRequired": false,
+    "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "CustomAliasAllowed": "Forbidden"
   },
   {
-    "Name": "Hashicorp Vault PKI",
-    "ShortName": "HCVPKI",
-    "Capability": "HCVPKI",
+    "Name": "K8SCluster",
+    "ShortName": "K8SCluster",
+    "Capability": "K8SCluster",
     "LocalStore": false,
     "SupportedOperations": {
-      "Add": false,
-      "Create": false,
+      "Add": true,
+      "Create": true,
       "Discovery": false,
       "Enrollment": false,
-      "Remove": false
+      "Remove": true
     },
     "Properties": [
       {
-        "Name": "MountPoint",
-        "DisplayName": "Mount Point",
-        "Type": "String",
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
         "DependsOn": "",
         "DefaultValue": null,
-        "Required": true
+        "Required": false
       },
       {
-        "Name": "VaultToken",
-        "DisplayName": "VaultToken",
-        "Type": "String",
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
         "DependsOn": "",
         "DefaultValue": null,
         "Required": true
       },
       {
-        "Name": "VaultServerUrl",
-        "DisplayName": "Vault Server URL",
-        "Type": "String",
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
+        "DefaultValue": "true",
+        "Required": true
       }
     ],
     "EntryParameters": null,
@@ -836,31 +707,87 @@
     "StorePathValue": "",
     "PrivateKeyAllowed": "Optional",
     "JobProperties": [],
-    "ServerRequired": false,
+    "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "VMware-NSX",
-    "ShortName": "VMware-NSX",
-    "Capability": "VMware-NSX",
+    "Name": "K8SJKS",
+    "ShortName": "K8SJKS",
+    "Capability": "K8SJKS",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
-      "Create": false,
-      "Discovery": false,
+      "Create": true,
+      "Discovery": true,
       "Enrollment": false,
       "Remove": true
     },
     "Properties": [
+      {
+        "Name": "KubeNamespace",
+        "DisplayName": "KubeNamespace",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "default",
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretName",
+        "DisplayName": "KubeSecretName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretType",
+        "DisplayName": "KubeSecretType",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "jks",
+        "Required": true
+      },
+      {
+        "Name": "CertificateDataFieldName",
+        "DisplayName": "CertificateDataFieldName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "PasswordFieldName",
+        "DisplayName": "PasswordFieldName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "password",
+        "Required": false
+      },
+      {
+        "Name": "PasswordIsK8SSecret",
+        "DisplayName": "PasswordIsK8SSecret",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "false",
+        "Required": false
+      },
+      {
+        "Name": "StorePasswordPath",
+        "DisplayName": "StorePasswordPath",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
       {
         "Name": "ServerUsername",
         "DisplayName": "Server Username",
         "Type": "Secret",
         "DependsOn": "",
         "DefaultValue": null,
-        "Required": true
+        "Required": false
       },
       {
         "Name": "ServerPassword",
@@ -877,24 +804,16 @@
         "DependsOn": "",
         "DefaultValue": "true",
         "Required": true
-      },
-      {
-        "Name": "ApiVersion",
-        "DisplayName": "X-Avi-Version",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "20.1.1",
-        "Required": true
       }
     ],
     "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
-      "StoreRequired": false,
+      "StoreRequired": true,
       "Style": "Default"
     },
-    "StorePathType": "MultipleChoice",
-    "StorePathValue": "[\"Application\",\"Controller\",\"CA\"]",
+    "StorePathType": "",
+    "StorePathValue": "",
     "PrivateKeyAllowed": "Optional",
     "JobProperties": [],
     "ServerRequired": true,
@@ -903,14 +822,10 @@
     "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "RFJKS",
-    "ShortName": "RFJKS",
-    "Capability": "RFJKS",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
+    "Name": "K8SNS",
+    "ShortName": "K8SNS",
+    "Capability": "K8SNS",
+    "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
       "Create": true,
@@ -918,40 +833,60 @@
       "Enrollment": false,
       "Remove": true
     },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
     "Properties": [
       {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
+        "Name": "KubeNamespace",
+        "DisplayName": "Kube Namespace",
         "Type": "String",
-        "DefaultValue": ""
+        "DependsOn": "",
+        "DefaultValue": "default",
+        "Required": false
       },
       {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
         "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
+      {
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "true",
+        "Required": true
       }
     ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFPEM",
-    "ShortName": "RFPEM",
-    "Capability": "RFPEM",
+    "EntryParameters": null,
+    "PasswordOptions": {
+      "EntrySupported": false,
+      "StoreRequired": false,
+      "Style": "Default"
+    },
+    "StorePathType": "",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
     "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden",
     "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Required"
+  },
+  {
+    "Name": "K8SPKCS12",
+    "ShortName": "K8SPKCS12",
+    "Capability": "K8SPKCS12",
+    "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
       "Create": true,
@@ -959,70 +894,264 @@
       "Enrollment": false,
       "Remove": true
     },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
     "Properties": [
       {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
+        "Name": "KubeSecretKey",
+        "DisplayName": "Kube Secret Key",
         "Type": "String",
-        "DefaultValue": ""
+        "DependsOn": "",
+        "DefaultValue": "pfx",
+        "Required": false
       },
       {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
+        "Name": "PasswordFieldName",
+        "DisplayName": "Password Field Name",
         "Type": "String",
-        "DefaultValue": ""
+        "DependsOn": "",
+        "DefaultValue": "password",
+        "Required": false
       },
       {
-        "Name": "IsTrustStore",
-        "DisplayName": "Trust Store",
-        "Required": false,
-        "DependsOn": "",
+        "Name": "PasswordIsK8SSecret",
+        "DisplayName": "Password Is K8S Secret",
         "Type": "Bool",
-        "DefaultValue": false
+        "DependsOn": "",
+        "DefaultValue": "false",
+        "Required": false
       },
       {
-        "Name": "IncludesChain",
-        "DisplayName": "Store Includes Chain",
-        "Required": false,
+        "Name": "KubeNamespace",
+        "DisplayName": "Kube Namespace",
+        "Type": "String",
         "DependsOn": "",
-        "Type": "Bool",
-        "DefaultValue": false
+        "DefaultValue": "default",
+        "Required": false
       },
       {
-        "Name": "SeparatePrivateKeyFilePath",
-        "DisplayName": "Separate Private Key File Location",
-        "Required": false,
-        "DependsOn": "",
+        "Name": "KubeSecretName",
+        "DisplayName": "Kube Secret Name",
         "Type": "String",
-        "DefaultValue": ""
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
       },
       {
-        "Name": "IsRSAPrivateKey",
-        "DisplayName": "Is RSA Private Key",
-        "Required": false,
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
         "DependsOn": "",
-        "Type": "Bool",
-        "DefaultValue": false
-      }
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
+      {
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "true",
+        "Required": true
+      },
+      {
+        "Name": "KubeSecretType",
+        "DisplayName": "Kube Secret Type",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "pkcs12",
+        "Required": true
+      },
+      {
+        "Name": "StorePasswordPath",
+        "DisplayName": "StorePasswordPath",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      }
     ],
-    "EntryParameters": []
+    "EntryParameters": null,
+    "PasswordOptions": {
+      "EntrySupported": false,
+      "StoreRequired": true,
+      "Style": "Default"
+    },
+    "StorePathType": "",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
+    "ServerRequired": true,
+    "PowerShell": false,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "RFPkcs12",
-    "ShortName": "RFPkcs12",
-    "Capability": "RFPkcs12",
+    "Name": "K8SSecret",
+    "ShortName": "K8SSecret",
+    "Capability": "K8SSecret",
+    "LocalStore": false,
+    "SupportedOperations": {
+      "Add": true,
+      "Create": true,
+      "Discovery": true,
+      "Enrollment": false,
+      "Remove": true
+    },
+    "Properties": [
+      {
+        "Name": "KubeNamespace",
+        "DisplayName": "KubeNamespace",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretName",
+        "DisplayName": "KubeSecretName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretType",
+        "DisplayName": "KubeSecretType",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "secret",
+        "Required": true
+      },
+      {
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
+      {
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "true",
+        "Required": true
+      }
+    ],
+    "EntryParameters": null,
+    "PasswordOptions": {
+      "EntrySupported": false,
+      "StoreRequired": false,
+      "Style": "Default"
+    },
+    "StorePathType": "",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
     "ServerRequired": true,
+    "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
+    "CustomAliasAllowed": "Forbidden"
+  },
+  {
+    "Name": "K8STLSSecr",
+    "ShortName": "K8STLSSecr",
+    "Capability": "K8STLSSecr",
+    "LocalStore": false,
+    "SupportedOperations": {
+      "Add": true,
+      "Create": true,
+      "Discovery": true,
+      "Enrollment": false,
+      "Remove": true
+    },
+    "Properties": [
+      {
+        "Name": "KubeNamespace",
+        "DisplayName": "KubeNamespace",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretName",
+        "DisplayName": "KubeSecretName",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "KubeSecretType",
+        "DisplayName": "KubeSecretType",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "tls_secret",
+        "Required": true
+      },
+      {
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": false
+      },
+      {
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
+        "DependsOn": "",
+        "DefaultValue": null,
+        "Required": true
+      },
+      {
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "true",
+        "Required": true
+      }
+    ],
+    "EntryParameters": null,
+    "PasswordOptions": {
+      "EntrySupported": false,
+      "StoreRequired": false,
+      "Style": "Default"
+    },
+    "StorePathType": "",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
+    "ServerRequired": true,
+    "PowerShell": false,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Forbidden"
+  },
+  {
+    "Name": "RFDER",
+    "ShortName": "RFDER",
+    "Capability": "RFDER",
+    "ServerRequired": true,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Forbidden",
     "PowerShell": false,
     "PrivateKeyAllowed": "Optional",
     "SupportedOperations": {
@@ -1053,17 +1182,25 @@
         "DependsOn": "",
         "Type": "String",
         "DefaultValue": ""
+      },
+      {
+        "Name": "SeparatePrivateKeyFilePath",
+        "DisplayName": "Separate Private Key File Location",
+        "Required": false,
+        "DependsOn": "",
+        "Type": "String",
+        "DefaultValue": ""
       }
     ],
     "EntryParameters": []
   },
   {
-    "Name": "RFDER",
-    "ShortName": "RFDER",
-    "Capability": "RFDER",
+    "Name": "RFJKS",
+    "ShortName": "RFJKS",
+    "Capability": "RFJKS",
     "ServerRequired": true,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden",
+    "CustomAliasAllowed": "Required",
     "PowerShell": false,
     "PrivateKeyAllowed": "Optional",
     "SupportedOperations": {
@@ -1094,14 +1231,6 @@
         "DependsOn": "",
         "Type": "String",
         "DefaultValue": ""
-      },
-      {
-        "Name": "SeparatePrivateKeyFilePath",
-        "DisplayName": "Separate Private Key File Location",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
       }
     ],
     "EntryParameters": []
@@ -1148,81 +1277,63 @@
     "EntryParameters": []
   },
   {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
+    "Name": "RFORA",
+    "ShortName": "RFORA",
+    "Capability": "RFORA",
+    "ServerRequired": true,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Required",
+    "PowerShell": false,
+    "PrivateKeyAllowed": "Optional",
     "SupportedOperations": {
       "Add": true,
-      "Create": false,
-      "Discovery": false,
+      "Create": true,
+      "Discovery": true,
+      "Enrollment": false,
       "Remove": true
     },
+    "PasswordOptions": {
+      "Style": "Default",
+      "EntrySupported": false,
+      "StoreRequired": true
+    },
     "Properties": [
       {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
+        "Name": "LinuxFilePermissionsOnStoreCreation",
+        "DisplayName": "Linux File Permissions on Store Creation",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
         "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
+        "DefaultValue": ""
       },
       {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
+        "Name": "LinuxFileOwnerOnStoreCreation",
+        "DisplayName": "Linux File Owner on Store Creation",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
+        "Type": "String",
+        "DefaultValue": ""
       },
       {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
+        "Name": "WorkFolder",
+        "DisplayName": "Location to use for creation/removal of work files",
+        "Required": true,
         "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
         "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
+        "DefaultValue": ""
       }
     ],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "EntryParameters": []
   },
   {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
+    "Name": "RFPEM",
+    "ShortName": "RFPEM",
+    "Capability": "RFPEM",
+    "ServerRequired": true,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Forbidden",
+    "PowerShell": false,
+    "PrivateKeyAllowed": "Optional",
     "SupportedOperations": {
       "Add": true,
       "Create": true,
@@ -1230,153 +1341,72 @@
       "Enrollment": false,
       "Remove": true
     },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
     "PasswordOptions": {
+      "Style": "Default",
       "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
+      "StoreRequired": true
     },
     "Properties": [
       {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
+        "Name": "LinuxFilePermissionsOnStoreCreation",
+        "DisplayName": "Linux File Permissions on Store Creation",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
+        "Type": "String",
+        "DefaultValue": ""
       },
       {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
+        "Name": "LinuxFileOwnerOnStoreCreation",
+        "DisplayName": "Linux File Owner on Store Creation",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
+        "Type": "String",
+        "DefaultValue": ""
       },
       {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
+        "Name": "IsTrustStore",
+        "DisplayName": "Trust Store",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
+        "Type": "Bool",
+        "DefaultValue": false
       },
       {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
+        "Name": "IncludesChain",
+        "DisplayName": "Store Includes Chain",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
+        "Type": "Bool",
+        "DefaultValue": false
       },
       {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
+        "Name": "SeparatePrivateKeyFilePath",
+        "DisplayName": "Separate Private Key File Location",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
+        "Type": "String",
+        "DefaultValue": ""
       },
       {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
+        "Name": "IsRSAPrivateKey",
+        "DisplayName": "Is RSA Private Key",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
+        "Type": "Bool",
+        "DefaultValue": false
       }
     ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "EntryParameters": []
   },
   {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
+    "Name": "RFPkcs12",
+    "ShortName": "RFPkcs12",
+    "Capability": "RFPkcs12",
+    "ServerRequired": true,
+    "BlueprintAllowed": false,
+    "CustomAliasAllowed": "Required",
+    "PowerShell": false,
+    "PrivateKeyAllowed": "Optional",
     "SupportedOperations": {
       "Add": true,
       "Create": true,
@@ -1384,1174 +1414,44 @@
       "Enrollment": false,
       "Remove": true
     },
+    "PasswordOptions": {
+      "Style": "Default",
+      "EntrySupported": false,
+      "StoreRequired": true
+    },
     "Properties": [
       {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
+        "Name": "LinuxFilePermissionsOnStoreCreation",
+        "DisplayName": "Linux File Permissions on Store Creation",
+        "Required": false,
         "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
         "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
+        "DefaultValue": ""
       },
       {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "RFJKS",
-    "ShortName": "RFJKS",
-    "Capability": "RFJKS",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFPEM",
-    "ShortName": "RFPEM",
-    "Capability": "RFPEM",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "IsTrustStore",
-        "DisplayName": "Trust Store",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "Bool",
-        "DefaultValue": false
-      },
-      {
-        "Name": "IncludesChain",
-        "DisplayName": "Store Includes Chain",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "Bool",
-        "DefaultValue": false
-      },
-      {
-        "Name": "SeparatePrivateKeyFilePath",
-        "DisplayName": "Separate Private Key File Location",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "IsRSAPrivateKey",
-        "DisplayName": "Is RSA Private Key",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "Bool",
-        "DefaultValue": false
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFPkcs12",
-    "ShortName": "RFPkcs12",
-    "Capability": "RFPkcs12",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFDER",
-    "ShortName": "RFDER",
-    "Capability": "RFDER",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Forbidden",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "SeparatePrivateKeyFilePath",
-        "DisplayName": "Separate Private Key File Location",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFKDB",
-    "ShortName": "RFKDB",
-    "Capability": "RFKDB",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "RFORA",
-    "ShortName": "RFORA",
-    "Capability": "RFORA",
-    "ServerRequired": true,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "PowerShell": false,
-    "PrivateKeyAllowed": "Optional",
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "PasswordOptions": {
-      "Style": "Default",
-      "EntrySupported": false,
-      "StoreRequired": true
-    },
-    "Properties": [
-      {
-        "Name": "LinuxFilePermissionsOnStoreCreation",
-        "DisplayName": "Linux File Permissions on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "LinuxFileOwnerOnStoreCreation",
-        "DisplayName": "Linux File Owner on Store Creation",
-        "Required": false,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      },
-      {
-        "Name": "WorkFolder",
-        "DisplayName": "Location to use for creation/removal of work files",
-        "Required": true,
-        "DependsOn": "",
-        "Type": "String",
-        "DefaultValue": ""
-      }
-    ],
-    "EntryParameters": []
-  },
-  {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": false,
-      "Discovery": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      }
-    ],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": false,
-      "Discovery": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      }
-    ],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": false,
-      "Discovery": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      }
-    ],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": false,
-      "Discovery": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      }
-    ],
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
-      }
-    ],
-    "EntryParameters": null,
-    "PasswordOptions": {
-      "EntrySupported": false,
-      "StoreRequired": false,
-      "Style": "Default"
-    },
-    "StorePathType": "",
-    "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [],
-    "ServerRequired": true,
-    "PowerShell": false,
-    "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
-  },
-  {
-    "Name": "Azure Keyvault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
-    "LocalStore": false,
-    "SupportedOperations": {
-      "Add": true,
-      "Create": true,
-      "Discovery": true,
-      "Enrollment": false,
-      "Remove": true
-    },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "VaultName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "ResourceGroupName",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": false
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "AzureCloud",
-        "DisplayName": "Azure Cloud",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "public,china,germany,government",
-        "Required": false
-      },
-      {
-        "Name": "PrivateEndpoint",
-        "DisplayName": "Private KeyVault Endpoint",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": false
+        "Name": "LinuxFileOwnerOnStoreCreation",
+        "DisplayName": "Linux File Owner on Store Creation",
+        "Required": false,
+        "DependsOn": "",
+        "Type": "String",
+        "DefaultValue": ""
       }
     ],
-    "EntryParameters": null,
+    "EntryParameters": []
+  },
+  {
+    "Name": "SampleStoreType",
+    "ShortName": "SAMPLETYPE",
+    "Capability": "SAMPLETYPE",
+    "SupportedOperations": {
+      "Add": false,
+      "Create": false,
+      "Discovery": false,
+      "Enrollment": false,
+      "Remove": false
+    },
+    "Properties": [],
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
@@ -2559,268 +1459,228 @@
     },
     "StorePathType": "",
     "StorePathValue": "",
-    "PrivateKeyAllowed": "Optional",
+    "PrivateKeyAllowed": "Forbidden",
     "JobProperties": [],
-    "ServerRequired": true,
+    "ServerRequired": false,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "CustomAliasAllowed": "Forbidden"
   },
   {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
+    "Name": "Signum",
+    "ShortName": "Signum",
+    "Capability": "Signum",
     "LocalStore": false,
     "SupportedOperations": {
-      "Add": true,
+      "Add": false,
       "Create": false,
       "Discovery": false,
-      "Remove": true
+      "Enrollment": false,
+      "Remove": false
     },
-    "Properties": [
-      {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "false",
-        "Required": true
-      },
-      {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": "",
-        "Required": true
-      },
-      {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "standard,premium",
-        "Required": true
-      },
-      {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
-        "Type": "String",
-        "DependsOn": "",
-        "DefaultValue": null,
-        "Required": true
-      }
-    ],
+    "Properties": [],
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
-    "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
+    "StorePathType": "",
+    "StorePathValue": "na",
+    "PrivateKeyAllowed": "Required",
+    "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "Azure KeyVault",
-    "ShortName": "AKV",
-    "Capability": "AKV",
+    "Name": "VMware-NSX",
+    "ShortName": "VMware-NSX",
+    "Capability": "VMware-NSX",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
       "Create": false,
       "Discovery": false,
+      "Enrollment": false,
       "Remove": true
     },
     "Properties": [
       {
-        "Name": "VaultName",
-        "DisplayName": "Vault Name",
-        "Type": "String",
+        "Name": "ServerUsername",
+        "DisplayName": "Server Username",
+        "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": "false",
+        "DefaultValue": null,
         "Required": true
       },
       {
-        "Name": "ResourceGroupName",
-        "DisplayName": "Resource Group Name",
-        "Type": "String",
+        "Name": "ServerPassword",
+        "DisplayName": "Server Password",
+        "Type": "Secret",
         "DependsOn": "",
-        "DefaultValue": "",
+        "DefaultValue": null,
         "Required": true
       },
       {
-        "Name": "SkuType",
-        "DisplayName": "SKU Type",
-        "Type": "MultipleChoice",
+        "Name": "ServerUseSsl",
+        "DisplayName": "Use SSL",
+        "Type": "Bool",
         "DependsOn": "",
-        "DefaultValue": "standard,premium",
+        "DefaultValue": "true",
         "Required": true
       },
       {
-        "Name": "VaultRegion",
-        "DisplayName": "Vault Region",
-        "Type": "MultipleChoice",
-        "DependsOn": "",
-        "DefaultValue": "eastus,eastus2,southcentralus,westus2,westus3,australiaeast,northeurope,swedencentral,uksouth,westeurope,centralus,southafricanorth,centralindia,eastasia,japaneast,koreacentral,canadacentral,francecentral,germanywestcentral,norwayeast,switzerlandnorth,uaenorth,brazilsouth,centraluseuap,eastus2euap,qatarcentral,centralusstage,eastusstage,eastus2stage,northcentralusstage,westusstage,asia,asiapacific,australia,brazil,canada,europe,france,germany,global,india,japan,korea,norway,singapore,southafrica,switzerland,uae,uk,unitedstates,unitedstatesuap,eastasiastage,southeastasiastage,brazilus,eastusstg,northcentralus,westus,jioindiawest,devfabric,westcentralus,southafricawest,australiacentral,australiacentral2,australiasoutheast,japanwest,jioindiacentral,koreasouth,southindia,westindia,canadaeast,francesouth,germanynorth,norwaywest,switzerlandwest,ukwest,uaecentral,brazilsoutheast",
-        "Required": false
-      },
-      {
-        "Name": "TenantId",
-        "DisplayName": "Tenant Id",
+        "Name": "ApiVersion",
+        "DisplayName": "X-Avi-Version",
         "Type": "String",
         "DependsOn": "",
-        "DefaultValue": null,
+        "DefaultValue": "20.1.1",
         "Required": true
       }
     ],
+    "EntryParameters": null,
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
+    "StorePathType": "MultipleChoice",
+    "StorePathValue": "[\"Application\",\"Controller\",\"CA\"]",
     "PrivateKeyAllowed": "Optional",
-    "JobProperties": [
-      "VaultName",
-      "ResourceGroupName",
-      "SkuType",
-      "VaultRegion",
-      "TenantId"
-    ],
+    "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Optional"
+    "CustomAliasAllowed": "Required"
   },
   {
-    "Name": "Azure Application Gateway",
-    "ShortName": "AzureAppGW",
-    "Capability": "AzureAppGW",
-    "LocalStore": false,
+    "Name": "WinCerMgmt",
+    "ShortName": "WinCerMgmt",
+    "Capability": "WinCerMgmt",
     "SupportedOperations": {
       "Add": true,
       "Create": false,
-      "Discovery": true,
+      "Discovery": false,
       "Enrollment": false,
       "Remove": true
     },
     "Properties": [
       {
-        "Name": "ServerUsername",
-        "DisplayName": "Server Username",
-        "Type": "Secret",
-        "DependsOn": null,
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerPassword",
-        "DisplayName": "Server Password",
-        "Type": "Secret",
-        "DependsOn": null,
-        "DefaultValue": null,
-        "Required": true
-      },
-      {
-        "Name": "ServerUseSsl",
-        "DisplayName": "Use SSL",
+        "Name": "spnwithport",
+        "DisplayName": "spnwithport",
         "Type": "Bool",
-        "DependsOn": null,
-        "DefaultValue": "true",
+        "DependsOn": "",
+        "DefaultValue": "false",
         "Required": false
       }
     ],
-    "EntryParameters": [
-      {
-        "Name": "HTTPListenerName",
-        "DisplayName": "HTTP Listener Name",
-        "Type": "String",
-        "RequiredWhen": {
-          "HasPrivateKey": false,
-          "OnAdd": false,
-          "OnRemove": false,
-          "OnReenrollment": false
-        }
-      }
-    ],
+    "EntryParameters": [],
     "PasswordOptions": {
       "EntrySupported": false,
       "StoreRequired": false,
       "Style": "Default"
     },
-    "PrivateKeyAllowed": "Required",
+    "StorePathType": "",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
+    "JobProperties": [],
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "ServerRegistration": 13,
-    "InventoryEndpoint": "/AnyInventory/Update"
+    "CustomAliasAllowed": "Forbidden"
   },
   {
-    "Name": "Azure Application Gateway",
-    "ShortName": "AzureAppGW",
-    "Capability": "AzureAppGW",
+    "Name": "Windows Certificate",
+    "ShortName": "WinCert",
+    "Capability": "WinCert",
     "LocalStore": false,
     "SupportedOperations": {
       "Add": true,
       "Create": false,
-      "Discovery": true,
-      "Enrollment": false,
+      "Discovery": false,
+      "Enrollment": true,
       "Remove": true
     },
     "Properties": [
+      {
+        "Name": "spnwithport",
+        "DisplayName": "SPN With Port",
+        "Type": "Bool",
+        "DependsOn": "",
+        "DefaultValue": "false",
+        "Required": false
+      },
+      {
+        "Name": "WinRM Protocol",
+        "DisplayName": "WinRM Protocol",
+        "Type": "MultipleChoice",
+        "DependsOn": "",
+        "DefaultValue": "https,http",
+        "Required": true
+      },
+      {
+        "Name": "WinRM Port",
+        "DisplayName": "WinRM Port",
+        "Type": "String",
+        "DependsOn": "",
+        "DefaultValue": "5986",
+        "Required": true
+      },
       {
         "Name": "ServerUsername",
         "DisplayName": "Server Username",
         "Type": "Secret",
-        "DependsOn": null,
+        "DependsOn": "",
         "DefaultValue": null,
-        "Required": true
+        "Required": false
       },
       {
         "Name": "ServerPassword",
         "DisplayName": "Server Password",
         "Type": "Secret",
-        "DependsOn": null,
+        "DependsOn": "",
         "DefaultValue": null,
-        "Required": true
+        "Required": false
       },
       {
         "Name": "ServerUseSsl",
         "DisplayName": "Use SSL",
         "Type": "Bool",
-        "DependsOn": null,
+        "DependsOn": "",
         "DefaultValue": "true",
-        "Required": false
+        "Required": true
       }
     ],
     "EntryParameters": [
       {
-        "Name": "HTTPListenerName",
-        "DisplayName": "HTTP Listener Name",
+        "Name": "ProviderName",
+        "DisplayName": "Crypto Provider Name",
         "Type": "String",
         "RequiredWhen": {
           "HasPrivateKey": false,
           "OnAdd": false,
           "OnRemove": false,
           "OnReenrollment": false
-        }
+        },
+        "DependsOn": "",
+        "DefaultValue": "",
+        "Options": ""
+      },
+      {
+        "Name": "SAN",
+        "DisplayName": "SAN",
+        "Type": "String",
+        "RequiredWhen": {
+          "HasPrivateKey": false,
+          "OnAdd": false,
+          "OnRemove": false,
+          "OnReenrollment": true
+        },
+        "DependsOn": "",
+        "DefaultValue": "",
+        "Options": ""
       }
     ],
     "PasswordOptions": {
@@ -2828,12 +1688,11 @@
       "StoreRequired": false,
       "Style": "Default"
     },
-    "PrivateKeyAllowed": "Required",
+    "StorePathValue": "",
+    "PrivateKeyAllowed": "Optional",
     "ServerRequired": true,
     "PowerShell": false,
     "BlueprintAllowed": false,
-    "CustomAliasAllowed": "Required",
-    "ServerRegistration": 13,
-    "InventoryEndpoint": "/AnyInventory/Update"
+    "CustomAliasAllowed": "Forbidden"
   }
 ]
\ No newline at end of file