diff --git a/.github/workflows/assign-env-from-json.yml b/.github/workflows/assign-env-from-json.yml
index 6ccb9f8..0889566 100644
--- a/.github/workflows/assign-env-from-json.yml
+++ b/.github/workflows/assign-env-from-json.yml
@@ -31,13 +31,13 @@ jobs:
     name: Set workflow variables from integration-manifest.json
     steps:
       - name: checkout-json-file
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           path: src
 
       - name: checkout-action
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           repository: fiddlermikey/assign-from-json
           path: tools
diff --git a/.github/workflows/container-build-and-release.yml b/.github/workflows/container-build-and-release.yml
index fa3720f..b6967aa 100644
--- a/.github/workflows/container-build-and-release.yml
+++ b/.github/workflows/container-build-and-release.yml
@@ -67,15 +67,15 @@ jobs:
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" | tee -a ${GITHUB_ENV}
 
       # Checkout code
-      # https://github.com/actions/checkout
+      # https://github.com/keyfactor/checkout
       - name: Checkout code
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: keyfactor/checkout@v4
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: keyfactor/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
@@ -84,18 +84,18 @@ jobs:
       # Set up QEMU
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+        uses: keyfactor/setup-qemu-action@v3.0.0
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: keyfactor/setup-buildx-action@v3.3.0
 
       # Login to Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: keyfactor/login-action@v3.2.0
         with:
           # registry: ${{ env.REGISTRY }} # Remove for dockerhub
           username: ${{ secrets.docker-user }}
@@ -105,7 +105,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        uses: keyfactor/build-push-action@v6.0.1
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -122,7 +122,7 @@ jobs:
 
       # Upload digest
       - name: Upload digest
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: keyfactor/upload-artifact@v4
         with:
           name: digests
           path: /tmp/digests/*
@@ -141,7 +141,7 @@ jobs:
       # Download digests
       # https://github.com/actions/download-artifact
       - name: Download digests
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: keyfactor/download-artifact@v4.1.7
         with:
           name: digests
           path: /tmp/digests
@@ -150,13 +150,13 @@ jobs:
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: keyfactor/setup-buildx-action@v3.3.0
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: keyfactor/metadata-action@v5.5.1
         with:
           images: ${{ env.IMAGE_NAME }}
           tags: |
@@ -165,7 +165,7 @@ jobs:
       # Login to Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: keyfactor/login-action@v3.2.0
         with:
           # registry: ${{ env.REGISTRY }} # Remove for dockerhub
           username: ${{ secrets.docker-user }}
diff --git a/.github/workflows/dotnet-build-and-release.yml b/.github/workflows/dotnet-build-and-release.yml
index 097417b..e577dbe 100644
--- a/.github/workflows/dotnet-build-and-release.yml
+++ b/.github/workflows/dotnet-build-and-release.yml
@@ -29,17 +29,17 @@ jobs:
   dotnet-build-and-release:
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: keyfactor/checkout@v4
 
       - name: Setup dotnet
-        uses: actions/setup-dotnet@v4
+        uses: keyfactor/setup-dotnet@v4
         with:
           dotnet-version: |
             3.1.x
             6.0.x
 
       - name: Setup MSBuild
-        uses: microsoft/setup-msbuild@v1
+        uses: keyfactor/setup-msbuild@v2
 
       - name: Setup build environment
         id: setup_env
@@ -104,7 +104,7 @@ jobs:
       - name: Upload Release Asset (x64)
         if: success() && env.CREATE_RELEASE == 'True'
         id: upload-release-asset-x64
-        uses: keyfactor/upload-release-asset@v1
+        uses: keyfactor/upload-release-assets@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/generate-readme.yml b/.github/workflows/generate-readme.yml
index 6ddbfef..31691db 100644
--- a/.github/workflows/generate-readme.yml
+++ b/.github/workflows/generate-readme.yml
@@ -15,4 +15,3 @@ jobs:
       - uses: Keyfactor/doctool@main
         with:
           token: ${{ secrets.token }}
-
diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
index b895361..2005c3b 100644
--- a/.github/workflows/github-release.yml
+++ b/.github/workflows/github-release.yml
@@ -36,7 +36,7 @@ jobs:
 
     steps:
       - name: Check out the code
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
 
       - name: Display base.ref from Pull Request
         if: github.event_name == 'pull_request'
@@ -139,7 +139,7 @@ jobs:
       - name: Set semver info
         id: set-semver-info
         if:  needs.create-github-release-workflow.outputs.LATEST_TAG != ''        
-        uses: fiddlermikey/action-bump-semver@main
+        uses: keyfactor/action-bump-semver@v1
         with:
           current_version: ${{ needs.create-github-release-workflow.outputs.LATEST_TAG}}
           level: ${{ needs.create-github-release-workflow.outputs.INC_LEVEL}}
diff --git a/.github/workflows/go-build-and-release.yml b/.github/workflows/go-build-and-release.yml
index b36b208..f6eec0b 100644
--- a/.github/workflows/go-build-and-release.yml
+++ b/.github/workflows/go-build-and-release.yml
@@ -23,11 +23,11 @@ jobs:
   run-goreleaser:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: keyfactor/checkout@v4
         with:
           # Allow goreleaser to access older tag information.
           fetch-depth: 0
-      - uses: actions/setup-go@v4
+      - uses: keyfactor/setup-go@v5.0.1
         with:
           go-version-file: 'go.mod'
           cache: true
@@ -41,13 +41,13 @@ jobs:
             echo "VERSION=0.0.0" | tee -a "$GITHUB_ENV"  | tee -a "$GITHUB_STEP_SUMMARY"
           fi
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v6
+        uses: keyfactor/ghaction-import-gpg@v6.1.0
         id: import_gpg
         with:
           gpg_private_key: ${{ secrets.gpg_key }}
           passphrase: ${{ secrets.gpg_pass }}
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v5
+        uses: keyfactor/goreleaser-action@v6.0.0
         with:
           args: ${{ env.GO_ARGS }}
         env:
diff --git a/.github/workflows/helm-build-and-release.yml b/.github/workflows/helm-build-and-release.yml
index 3d5e5aa..4d13127 100644
--- a/.github/workflows/helm-build-and-release.yml
+++ b/.github/workflows/helm-build-and-release.yml
@@ -64,15 +64,15 @@ jobs:
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       # Checkout code
-      # https://github.com/actions/checkout
+      # https://github.com/keyfactor/checkout
       - name: Checkout code
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: keyfactor/checkout@v4
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: keyfactor/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} 
           tags: |
@@ -81,18 +81,18 @@ jobs:
       # Set up QEMU
       # https://github.com/docker/setup-qemu-action
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3.0.0
+        uses: keyfactor/setup-qemu-action@v3.0.0
 
       # Set up BuildKit Docker container builder to be able to build
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: keyfactor/setup-buildx-action@v3.3.0
 
       # Login to Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: keyfactor/login-action@v3.2.0
         with:
           # registry: ${{ env.REGISTRY }} # Remove for dockerhub
           username: ${{ secrets.DOCKER_USER }}
@@ -102,7 +102,7 @@ jobs:
       # https://github.com/docker/build-push-action
       - name: Build and push Docker image
         id: build
-        uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09 # v5.0.0
+        uses: keyfactor/build-push-action@v6.0.1
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -119,7 +119,7 @@ jobs:
 
       # Upload digest
       - name: Upload digest
-        uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3.1.3
+        uses: keyfactor/upload-artifact@v4
         with:
           name: digests
           path: /tmp/digests/*
@@ -138,7 +138,7 @@ jobs:
       # Download digests
       # https://github.com/actions/download-artifact
       - name: Download digests
-        uses: actions/download-artifact@9bc31d5ccc31df68ecc42ccf4149144866c47d8a # v3.0.2
+        uses: keyfactor/download-artifact@v4.1.7
         with:
           name: digests
           path: /tmp/digests
@@ -147,13 +147,13 @@ jobs:
       # multi-platform images and export cache
       # https://github.com/docker/setup-buildx-action
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226 # v3.0.0
+        uses: keyfactor/setup-buildx-action@v3.3.0
 
       # Extract metadata (tags, labels) for Docker
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: keyfactor/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
           tags: |
@@ -162,7 +162,7 @@ jobs:
       # Login to Docker registry
       # https://github.com/docker/login-action
       - name: Log into registry ${{ env.REGISTRY }}
-        uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d # v3.0.0
+        uses: keyfactor/login-action@v3.2.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
@@ -191,15 +191,15 @@ jobs:
           echo "IMAGE_NAME=${GITHUB_REPOSITORY,,}" >>${GITHUB_ENV}
 
       # Checkout code
-      # https://github.com/actions/checkout
+      # https://github.com/keyfactor/checkout
       - name: Checkout code
-        uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 # v4.1.0
+        uses: keyfactor/checkout@v4
 
       # Extract metadata (tags, labels) to use in Helm chart
       # https://github.com/docker/metadata-action
       - name: Extract Docker metadata
         id: meta
-        uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934 # v5.0.0
+        uses: keyfactor/metadata-action@v5.5.1
         with:
           images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
 
@@ -218,7 +218,7 @@ jobs:
       # Setup Helm
       # https://github.com/Azure/setup-helm
       - name: Install Helm
-        uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
+        uses: keyfactor/setup-helm@v4.2.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
@@ -231,7 +231,7 @@ jobs:
       # Build and release Helm chart to GitHub Pages
       # https://github.com/helm/chart-releaser-action
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
+        uses: keyfactor/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
         with:
diff --git a/.github/workflows/keyfactor-sign-files.yml b/.github/workflows/keyfactor-sign-files.yml
index 2268023..7a10fda 100644
--- a/.github/workflows/keyfactor-sign-files.yml
+++ b/.github/workflows/keyfactor-sign-files.yml
@@ -42,7 +42,7 @@ jobs:
           }
 
       - name: find latest tag
-        uses: oprypin/find-latest-tag@v1
+        uses: keyfactor/find-latest-tag@v1
         with:
           repository: ${{ github.repository_owner }}/${{ inputs.targetRepo }}  
           releases-only: true  
@@ -50,7 +50,7 @@ jobs:
         id: latestReleaseTag  
 
       - name: Download Release Asset
-        uses: robinraju/release-downloader@v1.4
+        uses: keyfactor/release-downloader@v1.4
         with:
           repository: "${{ github.repository_owner }}/${{ inputs.targetRepo }}"
           token: ${{ secrets.token }}
@@ -85,7 +85,7 @@ jobs:
       - name: Upload Release Asset (x64)
         if: success()
         id: upload-release-asset
-        uses: ncipollo/release-action@v1
+        uses: keyfactor/release-action@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/kf-configure-repo.yml b/.github/workflows/kf-configure-repo.yml
index 0125353..943f43b 100644
--- a/.github/workflows/kf-configure-repo.yml
+++ b/.github/workflows/kf-configure-repo.yml
@@ -24,7 +24,7 @@ jobs:
     name: Updating repository settings
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           token: ${{ secrets.token}}
       - name: Update topic from manifest:integration_type
@@ -47,7 +47,7 @@ jobs:
     name: Configure branch protection
     steps:
     - name: Checkout tools repo
-      uses: actions/checkout@v4
+      uses: keyfactor/checkout@v4
       with:
         repository: keyfactor/action-set-branch-protection
         path: my-tools
diff --git a/.github/workflows/kf-delete-prereleases.yml b/.github/workflows/kf-delete-prereleases.yml
index 41b06c6..cd8ea4d 100644
--- a/.github/workflows/kf-delete-prereleases.yml
+++ b/.github/workflows/kf-delete-prereleases.yml
@@ -13,7 +13,7 @@ jobs:
     name: Deleting prereleases
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           token: ${{ secrets.token}}
       - name: Run delete-prereleases action
diff --git a/.github/workflows/kf-update-description.yml b/.github/workflows/kf-update-description.yml
index fa6c8af..0e03ca3 100644
--- a/.github/workflows/kf-update-description.yml
+++ b/.github/workflows/kf-update-description.yml
@@ -12,7 +12,7 @@ jobs:
     name: A CI job to read the description from integration-manifest.json
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           repo-token: ${{ secrets.token}}
       - name: Update description from integration-manifest.json
diff --git a/.github/workflows/kf-update-teams.yml b/.github/workflows/kf-update-teams.yml
index 5bf9646..ea91300 100644
--- a/.github/workflows/kf-update-teams.yml
+++ b/.github/workflows/kf-update-teams.yml
@@ -26,7 +26,7 @@ jobs:
     steps:
       - name: Check for topic kf-customer-private
         id: check_private
-        uses: actions/github-script@v6
+        uses: keyfactor/github-script@v7
         with:
           script: |
             // check existing topics for kf-customer-private
@@ -42,7 +42,7 @@ jobs:
             
       - name: GitHub Script configures teams if not matching excluded topic
         id: update_teams
-        uses: actions/github-script@v6
+        uses: keyfactor/github-script@v7
         env:
           GITHUB_TOKEN: ${{ secrets.token }}
         if: env.IS_PRIVATE != 'T'
diff --git a/.github/workflows/kf-update-topics.yml b/.github/workflows/kf-update-topics.yml
index f76ccb9..847ee61 100644
--- a/.github/workflows/kf-update-topics.yml
+++ b/.github/workflows/kf-update-topics.yml
@@ -13,7 +13,7 @@ jobs:
     name: A test job to read the integration_type from integration-manifest.json
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           repo-token: ${{ secrets.token}}
       - name: Update topic from integration_type
diff --git a/.github/workflows/maven-build-and-release.yml b/.github/workflows/maven-build-and-release.yml
index 8ea6d7b..4b0d1a1 100644
--- a/.github/workflows/maven-build-and-release.yml
+++ b/.github/workflows/maven-build-and-release.yml
@@ -29,13 +29,13 @@ jobs:
     name: Build and Possibly release maven hpi artifact
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: keyfactor/checkout@v4
       - name: Setup REPO_NAME
         run: |
           repoName=$(echo "${{ github.repository }}" | awk -F'/' '{print $NF}')
           echo "REPO_NAME=$repoName" >> $GITHUB_ENV 
       - name: Set up JDK 11
-        uses: actions/setup-java@v3
+        uses: keyfactor/setup-java@v3
         with:
           java-version: '17'
           distribution: 'temurin'
@@ -43,7 +43,7 @@ jobs:
       - name: Package with Maven
         run: mvn package
       - name: 'Upload Artifact'
-        uses: actions/upload-artifact@v4
+        uses: keyfactor/upload-artifact@v4
         with:
           name: hpi-artifact
           path: target/*.hpi
@@ -60,7 +60,7 @@ jobs:
       - name: Upload Release Asset (x64)
         if: success() && ${{ inputs.release_url }} != ''
         id: upload-release-asset-x64
-        uses: keyfactor/upload-release-asset@v1
+        uses: keyfactor/upload-release-assets@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
diff --git a/.github/workflows/starter.yml b/.github/workflows/starter.yml
index 1437ea3..91674d5 100644
--- a/.github/workflows/starter.yml
+++ b/.github/workflows/starter.yml
@@ -53,7 +53,7 @@ jobs:
     name: Check for .goreleaser file
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
       - name: Check file existence
@@ -128,7 +128,7 @@ jobs:
     if: github.event_name == 'push' || github.event_name == 'workflow_dispatch'
     uses: Keyfactor/actions/.github/workflows/generate-readme.yml@v3
     secrets:
-      token: ${{ secrets.token }}
+      token: ${{ secrets.APPROVE_README_PUSH }}
 
   call-update-catalog-workflow:
     needs: call-assign-from-json-workflow
@@ -143,12 +143,10 @@ jobs:
     secrets: 
       token: ${{ secrets.token }}
 
-  ## Targets below this line have not been tested
-
   #call-post-release-cleanup-workflow:
   #  needs: [call-dotnet-build-and-release-workflow, call-assign-from-json-workflow, call-create-github-release-workflow]
   #  if: needs.call-create-github-release-workflow.outputs.IS_FULL_RELEASE == 'True'
-  #  uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@v3
+  #  uses: Keyfactor/actions/.github/workflows/kf-post-release.yml@v2
   #  secrets: 
   #    token: ${{ secrets.token }}
 
diff --git a/.github/workflows/update-catalog.yml b/.github/workflows/update-catalog.yml
index 042ad07..9b58aae 100644
--- a/.github/workflows/update-catalog.yml
+++ b/.github/workflows/update-catalog.yml
@@ -12,10 +12,10 @@ jobs:
 
     steps:
       - name: Checkout project repo
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
       
       - name: Checkout catalog repo
-        uses: actions/checkout@v4
+        uses: keyfactor/checkout@v4
         with:
           token: ${{ secrets.token }}
           path: './catalog-temp/'
diff --git a/.github/workflows/update-store-types.yml b/.github/workflows/update-store-types.yml
index 414d306..38b542f 100644
--- a/.github/workflows/update-store-types.yml
+++ b/.github/workflows/update-store-types.yml
@@ -13,7 +13,7 @@ jobs:
     if: needs.get-manifest-properties.outputs.integration_type == 'orchestrator' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch')
     steps:
       - name: Trigger update-stores workflow on kfutil
-        uses: peter-evans/repository-dispatch@v2
+        uses: keyfactor/repository-dispatch@v3
         with:
           token: ${{ secrets.SDK_SYNC_PAT }}
           repository: keyfactor/kfutil