diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 82dd703..cf4b6f2 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,6 +16,11 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
+      - name: Activate twingate to access artifactory
+        uses: twingate/github-action@main
+        with:
+          service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
       - name: Get New Chart Version
         id: nv
         run: |
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 374e8f8..7afe28d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,6 +15,11 @@ jobs:
           clean: true
           fetch-depth: 0
 
+      - name: Activate twingate to access artifactory
+        uses: twingate/github-action@main
+        with:
+          service-key: ${{ secrets.TWINGATE_PUBLIC_REPO_KEY }}
+
       - uses: azure/setup-helm@v3
 
       - uses: actions/setup-python@v4
@@ -25,4 +30,4 @@ jobs:
         uses: helm/chart-testing-action@v2
 
       - name: Run chart-testing (lint)
-        run: ct lint --chart-dirs helm-charts --all --validate-maintainers=false --chart-repos bitnami=https://charts.bitnami.com/bitnami
+        run: ct lint --chart-dirs helm-charts --all --validate-maintainers=false --chart-repos artifactory=https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23cb014..463c399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## [3.9.1](https://github.com/puppetlabs/vmpooler-deployment/tree/3.9.1) (2025-08-01)
+
+[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.9.0...3.9.1)
+
+**Merged pull requests:**
+
+- \(P4DEVOPS-7373\) Use artifactory instead of bitnami repos [\#166](https://github.com/puppetlabs/vmpooler-deployment/pull/166) ([isaac-hammes](https://github.com/isaac-hammes))
+
 ## [3.9.0](https://github.com/puppetlabs/vmpooler-deployment/tree/3.9.0) (2025-06-05)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.8.3...3.9.0)
diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
index c6eb3c4..bd05a4a 100644
--- a/docker/Gemfile.lock
+++ b/docker/Gemfile.lock
@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    addressable (2.8.8)
+      public_suffix (>= 2.0.2, < 8.0)
     base64 (0.3.0)
     bindata (2.5.1)
     builder (3.3.0)
-    concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    concurrent-ruby (1.3.6)
+    connection_pool (2.5.5)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    faraday (2.13.1)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
-      net-http (>= 0.5.0)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
     google-apis-compute_v1 (0.86.0)
       google-apis-core (>= 0.11.0, < 2.a)
     google-apis-core (0.11.3)
@@ -49,23 +49,25 @@ GEM
       signet (>= 0.16, < 2.a)
     httpclient (2.9.0)
       mutex_m
-    json (2.12.2-java)
-    jwt (2.10.1)
+    json (2.18.0-java)
+    jwt (2.10.2)
       base64
     logger (1.7.0)
     memoist (0.16.2)
     mini_mime (1.1.5)
-    multi_json (1.15.0)
-    mustermann (3.0.3)
+    multi_json (1.19.1)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     mutex_m (0.3.0)
-    net-http (0.6.0)
-      uri
-    net-ldap (0.19.0)
-    nio4r (2.7.4-java)
-    nokogiri (1.18.8-java)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
+    net-ldap (0.20.0)
+      base64
+      ostruct
+    nio4r (2.7.5-java)
+    nokogiri (1.18.10-java)
       racc (~> 1.4)
-    opentelemetry-api (1.5.0)
+    opentelemetry-api (1.7.0)
     opentelemetry-common (0.20.1)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.23.0)
@@ -102,47 +104,48 @@ GEM
     opentelemetry-resource_detectors (0.24.2)
       google-cloud-env
       opentelemetry-sdk (~> 1.0)
-    opentelemetry-sdk (1.8.0)
+    opentelemetry-sdk (1.10.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.11.0)
+    opentelemetry-semantic_conventions (1.36.0)
       opentelemetry-api (~> 1.0)
     optimist (3.2.1)
     os (1.1.4)
+    ostruct (0.6.3)
     pickup (0.0.11)
-    prometheus-client (4.2.4)
+    prometheus-client (4.2.5)
       base64
     public_suffix (6.0.2)
-    puma (6.6.0-java)
+    puma (6.6.1-java)
       nio4r (~> 2.0)
     racc (1.8.1-java)
-    rack (2.2.17)
+    rack (2.2.21)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rake (13.3.0)
+    rake (13.3.1)
     rbvmomi2 (3.8.0)
       builder (~> 3.2)
       json (~> 2.3)
       nokogiri (~> 1.12, >= 1.12.5)
       optimist (~> 3.0)
-    redis (5.4.0)
+    redis (5.4.1)
       redis-client (>= 0.22.0)
-    redis-client (0.24.0)
+    redis-client (0.26.3)
       connection_pool
     representable (3.2.0)
       declarative (< 0.1.0)
       trailblazer-option (>= 0.1.1, < 0.2.0)
       uber (< 0.2.0)
     retriable (3.1.2)
-    rexml (3.4.1)
+    rexml (3.4.4)
     ruby2_keywords (0.0.5)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     sinatra (3.2.0)
       mustermann (~> 3.0)
@@ -153,11 +156,11 @@ GEM
       bindata (~> 2.3)
     statsd-ruby (1.5.0)
     thrift (0.22.0)
-    tilt (2.6.0)
+    tilt (2.7.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    uri (1.0.3)
-    vmpooler (3.7.0)
+    uri (1.1.1)
+    vmpooler (3.8.1)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.4)
       deep_merge (~> 1.2)
diff --git a/docs/index.yaml b/docs/index.yaml
index e27af22..a00122b 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,7 +3,37 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 5.7.0
-    created: "2025-06-04T18:24:47.631234427Z"
+    created: "2025-08-01T14:47:26.530766161Z"
+    dependencies:
+    - name: redis
+      repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: ac8ac8d284483f9fedd6dcd43c977620121ff63e12f410297f667e2bba44c4aa
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.9.1.tgz
+    version: 3.9.1
+  - apiVersion: v2
+    appVersion: 5.7.0
+    created: "2025-08-01T14:47:26.522784925Z"
+    dependencies:
+    - name: redis
+      repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+      version: 16.13.2
+    description: A Helm chart to deploy vmpooler
+    digest: 0c46e7c9566275f85c9a2525ce2f5e62cd377ddd7f273475bb7f4472a1fc8b29
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-3.9.1-rc.1.tgz
+    version: 3.9.1-rc.1
+  - apiVersion: v2
+    appVersion: 5.7.0
+    created: "2025-08-01T14:47:26.511435751Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +48,7 @@ entries:
     version: 3.9.0
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-06-04T18:24:47.625438315Z"
+    created: "2025-08-01T14:47:26.499359292Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +63,7 @@ entries:
     version: 3.8.3
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-06-04T18:24:47.618282595Z"
+    created: "2025-08-01T14:47:26.488598934Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +78,7 @@ entries:
     version: 3.8.2
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-06-04T18:24:47.612754389Z"
+    created: "2025-08-01T14:47:26.476360664Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +93,7 @@ entries:
     version: 3.8.1
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-06-04T18:24:47.605253804Z"
+    created: "2025-08-01T14:47:26.465872839Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +108,7 @@ entries:
     version: 3.8.0
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-06-04T18:24:47.598577343Z"
+    created: "2025-08-01T14:47:26.454823621Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +123,7 @@ entries:
     version: 3.7.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2025-06-04T18:24:47.591912393Z"
+    created: "2025-08-01T14:47:26.444772227Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +138,7 @@ entries:
     version: 3.6.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2025-06-04T18:24:47.586377221Z"
+    created: "2025-08-01T14:47:26.433931552Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +153,7 @@ entries:
     version: 3.5.3
   - apiVersion: v2
     appVersion: 5.5.2
-    created: "2025-06-04T18:24:47.579128987Z"
+    created: "2025-08-01T14:47:26.424035301Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +168,7 @@ entries:
     version: 3.5.2
   - apiVersion: v2
     appVersion: 5.5.1
-    created: "2025-06-04T18:24:47.573510514Z"
+    created: "2025-08-01T14:47:26.411819215Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +183,7 @@ entries:
     version: 3.5.1
   - apiVersion: v2
     appVersion: 5.5.0
-    created: "2025-06-04T18:24:47.566662882Z"
+    created: "2025-08-01T14:47:26.401583826Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +198,7 @@ entries:
     version: 3.5.0
   - apiVersion: v2
     appVersion: 5.4.1
-    created: "2025-06-04T18:24:47.561020382Z"
+    created: "2025-08-01T14:47:26.390414322Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +213,7 @@ entries:
     version: 3.4.1
   - apiVersion: v2
     appVersion: 5.4.0
-    created: "2025-06-04T18:24:47.554080668Z"
+    created: "2025-08-01T14:47:26.379928244Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +228,7 @@ entries:
     version: 3.4.0
   - apiVersion: v2
     appVersion: 5.3.0
-    created: "2025-06-04T18:24:47.548559865Z"
+    created: "2025-08-01T14:47:26.368518543Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +243,7 @@ entries:
     version: 3.3.0
   - apiVersion: v2
     appVersion: 5.2.0
-    created: "2025-06-04T18:24:47.541939939Z"
+    created: "2025-08-01T14:47:26.358252054Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +258,7 @@ entries:
     version: 3.2.0
   - apiVersion: v2
     appVersion: 5.1.0
-    created: "2025-06-04T18:24:47.536436978Z"
+    created: "2025-08-01T14:47:26.346223906Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -243,7 +273,7 @@ entries:
     version: 3.1.0
   - apiVersion: v2
     appVersion: 5.0.0
-    created: "2025-06-04T18:24:47.52981342Z"
+    created: "2025-08-01T14:47:26.336021044Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -258,7 +288,7 @@ entries:
     version: 3.0.0
   - apiVersion: v2
     appVersion: 4.1.0
-    created: "2025-06-04T18:24:47.524218831Z"
+    created: "2025-08-01T14:47:26.324819648Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -273,7 +303,7 @@ entries:
     version: 2.2.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2025-06-04T18:24:47.517391186Z"
+    created: "2025-08-01T14:47:26.314076098Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -288,7 +318,7 @@ entries:
     version: 2.1.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2025-06-04T18:24:47.511835116Z"
+    created: "2025-08-01T14:47:26.3025029Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -303,7 +333,7 @@ entries:
     version: 2.0.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-06-04T18:24:47.473314935Z"
+    created: "2025-08-01T14:47:26.217686479Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -318,7 +348,7 @@ entries:
     version: 1.19.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-06-04T18:24:47.466450376Z"
+    created: "2025-08-01T14:47:26.20615313Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -333,7 +363,7 @@ entries:
     version: 1.18.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-06-04T18:24:47.459739279Z"
+    created: "2025-08-01T14:47:26.192913076Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -348,7 +378,7 @@ entries:
     version: 1.17.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-06-04T18:24:47.45420536Z"
+    created: "2025-08-01T14:47:26.180016696Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -363,7 +393,7 @@ entries:
     version: 1.16.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-06-04T18:24:47.448007287Z"
+    created: "2025-08-01T14:47:26.163482559Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -378,7 +408,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-06-04T18:24:47.442521959Z"
+    created: "2025-08-01T14:47:26.148027262Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -393,7 +423,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2025-06-04T18:24:47.435676665Z"
+    created: "2025-08-01T14:47:26.129088412Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -408,7 +438,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2025-06-04T18:24:47.429543352Z"
+    created: "2025-08-01T14:47:26.115192635Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -423,7 +453,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2025-06-04T18:24:47.423251885Z"
+    created: "2025-08-01T14:47:26.104012949Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -438,7 +468,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2025-06-04T18:24:47.417896171Z"
+    created: "2025-08-01T14:47:26.094249573Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -453,7 +483,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-06-04T18:24:47.41095218Z"
+    created: "2025-08-01T14:47:26.08366946Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -468,7 +498,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-06-04T18:24:47.405531084Z"
+    created: "2025-08-01T14:47:26.073735253Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -483,7 +513,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-06-04T18:24:47.505168537Z"
+    created: "2025-08-01T14:47:26.292230858Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -498,7 +528,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-06-04T18:24:47.501626533Z"
+    created: "2025-08-01T14:47:26.282594053Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -513,7 +543,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2025-06-04T18:24:47.497970889Z"
+    created: "2025-08-01T14:47:26.274204699Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -528,7 +558,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2025-06-04T18:24:47.492723526Z"
+    created: "2025-08-01T14:47:26.265409971Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -543,7 +573,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-06-04T18:24:47.489200224Z"
+    created: "2025-08-01T14:47:26.256953201Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -558,7 +588,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-06-04T18:24:47.485663667Z"
+    created: "2025-08-01T14:47:26.246802746Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -573,7 +603,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-06-04T18:24:47.480545442Z"
+    created: "2025-08-01T14:47:26.238207026Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -588,7 +618,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-06-04T18:24:47.476896942Z"
+    created: "2025-08-01T14:47:26.228886776Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -601,4 +631,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2025-06-04T18:24:47.3976059Z"
+generated: "2025-08-01T14:47:26.062605037Z"
diff --git a/docs/vmpooler-3.9.1.tgz b/docs/vmpooler-3.9.1.tgz
new file mode 100644
index 0000000..1eb3b0e
Binary files /dev/null and b/docs/vmpooler-3.9.1.tgz differ
diff --git a/helm-charts/vmpooler/Chart.lock b/helm-charts/vmpooler/Chart.lock
index d5fddf2..3c00010 100644
--- a/helm-charts/vmpooler/Chart.lock
+++ b/helm-charts/vmpooler/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: redis
-  repository: https://charts.bitnami.com/bitnami
+  repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
   version: 16.13.2
-digest: sha256:3a3d3cfce254ddfa488e495a3e2e141ee59c0ea4a583ba813093def78ca132cb
-generated: "2023-01-24T12:41:13.082268468Z"
+digest: sha256:9f085fa04b66dea3610b03474b3eb2e2fd09733c4c6cbbda15a152770a9169b0
+generated: "2025-07-31T09:10:07.046655-07:00"
diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml
index 26eb5a8..87822f9 100644
--- a/helm-charts/vmpooler/Chart.yaml
+++ b/helm-charts/vmpooler/Chart.yaml
@@ -3,9 +3,9 @@ name: vmpooler
 description: A Helm chart to deploy vmpooler
 type: application
 icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
-version: 3.9.0
-appVersion: 5.7.0
+version: 3.10.0
+appVersion: 5.8.0
 dependencies:
   - name: redis
-    repository: https://charts.bitnami.com/bitnami
+    repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
     version: 16.13.2
diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml
index 65bdc28..e251dfa 100644
--- a/helm-charts/vmpooler/values.yaml
+++ b/helm-charts/vmpooler/values.yaml
@@ -130,6 +130,12 @@ affinity: {}
 # Redis provided by bitnami/redis
 # For a full list of parameters see: https://github.com/bitnami/charts/tree/master/bitnami/redis/
 redis:
+  # Override the Redis image
+  image:
+    registry: artifactory.delivery.puppetlabs.net
+    repository: release-engineering/redis
+    tag: "6.2.7-debian-11-r11"
+    pullPolicy: IfNotPresent
   fullnameOverride: redis
   architecture: standalone
   networkPolicy:
@@ -164,6 +170,11 @@ redis:
           - -c
           - echo "AUTH $REDIS_PASSWORD\nBGREWRITEAOF" | redis-cli
   metrics:
+    image:
+      registry: artifactory.delivery.puppetlabs.net
+      repository: release-engineering/redis-exporter
+      tag: "1.43.0-debian-11-r4"
+      pullPolicy: IfNotPresent
     enabled: true
     resources:
       requests:
diff --git a/helm-package b/helm-package
index a172c6a..d5e9b07 100644
--- a/helm-package
+++ b/helm-package
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-helm repo add bitnami https://charts.bitnami.com/bitnami
+helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
 cd /apps/helm-charts/vmpooler
 helm dependency update
 cd /apps/docs
diff --git a/update-chart-lock b/update-chart-lock
index 8748596..dff98f5 100755
--- a/update-chart-lock
+++ b/update-chart-lock
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 
 docker run --rm -it -v $(pwd):/apps --entrypoint /bin/sh alpine/helm \
-  -c 'helm repo add bitnami https://charts.bitnami.com/bitnami && cd /apps/helm-charts/vmpooler && helm dependency update'
+  -c 'helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local && cd /apps/helm-charts/vmpooler && helm dependency update'