diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index cf4b6f2..82dd703 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -16,11 +16,6 @@ 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 7afe28d..374e8f8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -15,11 +15,6 @@ 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
@@ -30,4 +25,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 artifactory=https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+        run: ct lint --chart-dirs helm-charts --all --validate-maintainers=false --chart-repos bitnami=https://charts.bitnami.com/bitnami
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 463c399..c905d6f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,29 +1,5 @@
 # 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)
-
-**Merged pull requests:**
-
-- \(maint\) Update vmpooler to version 3.7.0 [\#162](https://github.com/puppetlabs/vmpooler-deployment/pull/162) ([isaac-hammes](https://github.com/isaac-hammes))
-
-## [3.8.3](https://github.com/puppetlabs/vmpooler-deployment/tree/3.8.3) (2025-01-30)
-
-[Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.8.2...3.8.3)
-
-**Implemented enhancements:**
-
-- Update memory limit for api pod to 4G [\#159](https://github.com/puppetlabs/vmpooler-deployment/pull/159) ([mahikalra](https://github.com/mahikalra))
-
 ## [3.8.2](https://github.com/puppetlabs/vmpooler-deployment/tree/3.8.2) (2024-07-25)
 
 [Full Changelog](https://github.com/puppetlabs/vmpooler-deployment/compare/3.7.0...3.8.2)
@@ -40,6 +16,7 @@
 
 - \(maint\) Burn the 3.8.0 release and try building again [\#156](https://github.com/puppetlabs/vmpooler-deployment/pull/156) ([e-gris](https://github.com/e-gris))
 - \(maint\) empty commit for redeploy attempt [\#155](https://github.com/puppetlabs/vmpooler-deployment/pull/155) ([e-gris](https://github.com/e-gris))
+- RE-16207: Create a 3.8.0 release / script cleanup [\#154](https://github.com/puppetlabs/vmpooler-deployment/pull/154) ([e-gris](https://github.com/e-gris))
 - Bump jruby from 9.4.5.0-jdk11 to 9.4.7.0-jdk11 in /docker [\#152](https://github.com/puppetlabs/vmpooler-deployment/pull/152) ([dependabot[bot]](https://github.com/apps/dependabot))
 - Bump jruby from 9.4.3.0-jdk11 to 9.4.5.0-jdk11 in /docker [\#149](https://github.com/puppetlabs/vmpooler-deployment/pull/149) ([dependabot[bot]](https://github.com/apps/dependabot))
 
diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
index bd05a4a..e71ae46 100644
--- a/docker/Gemfile.lock
+++ b/docker/Gemfile.lock
@@ -1,24 +1,23 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    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.6)
-    connection_pool (2.5.5)
+    addressable (2.8.5)
+      public_suffix (>= 2.0.2, < 6.0)
+    base64 (0.1.1)
+    bindata (2.4.15)
+    builder (3.2.4)
+    concurrent-ruby (1.2.2)
+    connection_pool (2.4.1)
     declarative (0.0.20)
     deep_merge (1.2.2)
-    faraday (2.14.0)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.2)
-      net-http (~> 0.5)
-    google-apis-compute_v1 (0.86.0)
+    faraday (2.7.11)
+      base64
+      faraday-net_http (>= 2.0, < 3.1)
+      ruby2_keywords (>= 0.0.4)
+    faraday-net_http (3.0.2)
+    google-apis-compute_v1 (0.80.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-apis-core (0.11.3)
+    google-apis-core (0.11.1)
       addressable (~> 2.5, >= 2.5.1)
       googleauth (>= 0.16.2, < 2.a)
       httpclient (>= 2.8.1, < 3.a)
@@ -26,20 +25,20 @@ GEM
       representable (~> 3.0)
       retriable (>= 2.0, < 4.a)
       rexml
-    google-apis-dns_v1 (0.36.0)
+      webrick
+    google-apis-dns_v1 (0.34.0)
       google-apis-core (>= 0.11.0, < 2.a)
-    google-cloud-core (1.8.0)
-      google-cloud-env (>= 1.0, < 3.a)
+    google-cloud-core (1.6.0)
+      google-cloud-env (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-cloud-dns (0.35.1)
       google-apis-dns_v1 (~> 0.1)
       google-cloud-core (~> 1.6)
       googleauth (>= 0.16.2, < 2.a)
       zonefile (~> 1.04)
-    google-cloud-env (2.3.1)
-      base64 (~> 0.2)
-      faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.5.0)
+    google-cloud-env (1.6.0)
+      faraday (>= 0.17.3, < 3.0)
+    google-cloud-errors (1.3.1)
     googleauth (1.2.0)
       faraday (>= 0.17.3, < 3.a)
       jwt (>= 1.4, < 3.0)
@@ -47,28 +46,20 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    httpclient (2.9.0)
-      mutex_m
-    json (2.18.0-java)
-    jwt (2.10.2)
-      base64
-    logger (1.7.0)
+    httpclient (2.8.3)
+    json (2.6.3-java)
+    jwt (2.7.1)
     memoist (0.16.2)
     mini_mime (1.1.5)
-    multi_json (1.19.1)
-    mustermann (3.0.4)
+    multi_json (1.15.0)
+    mustermann (3.0.0)
       ruby2_keywords (~> 0.0.1)
-    mutex_m (0.3.0)
-    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)
+    net-ldap (0.18.0)
+    nio4r (2.5.9-java)
+    nokogiri (1.15.4-java)
       racc (~> 1.4)
-    opentelemetry-api (1.7.0)
-    opentelemetry-common (0.20.1)
+    opentelemetry-api (1.2.3)
+    opentelemetry-common (0.20.0)
       opentelemetry-api (~> 1.0)
     opentelemetry-exporter-jaeger (0.23.0)
       opentelemetry-api (~> 1.1)
@@ -76,7 +67,7 @@ GEM
       opentelemetry-sdk (~> 1.2)
       opentelemetry-semantic_conventions
       thrift
-    opentelemetry-instrumentation-base (0.22.3)
+    opentelemetry-instrumentation-base (0.22.2)
       opentelemetry-api (~> 1.0)
       opentelemetry-registry (~> 0.1)
     opentelemetry-instrumentation-concurrent_ruby (0.21.1)
@@ -99,68 +90,64 @@ GEM
       opentelemetry-common (~> 0.20.0)
       opentelemetry-instrumentation-base (~> 0.22.1)
       opentelemetry-instrumentation-rack (~> 0.21)
-    opentelemetry-registry (0.4.0)
+    opentelemetry-registry (0.3.0)
       opentelemetry-api (~> 1.1)
     opentelemetry-resource_detectors (0.24.2)
       google-cloud-env
       opentelemetry-sdk (~> 1.0)
-    opentelemetry-sdk (1.10.0)
+    opentelemetry-sdk (1.3.0)
       opentelemetry-api (~> 1.1)
       opentelemetry-common (~> 0.20)
       opentelemetry-registry (~> 0.2)
       opentelemetry-semantic_conventions
-    opentelemetry-semantic_conventions (1.36.0)
+    opentelemetry-semantic_conventions (1.10.0)
       opentelemetry-api (~> 1.0)
-    optimist (3.2.1)
+    optimist (3.1.0)
     os (1.1.4)
-    ostruct (0.6.3)
     pickup (0.0.11)
-    prometheus-client (4.2.5)
-      base64
-    public_suffix (6.0.2)
-    puma (6.6.1-java)
+    prometheus-client (4.2.1)
+    public_suffix (5.0.3)
+    puma (6.4.0-java)
       nio4r (~> 2.0)
-    racc (1.8.1-java)
-    rack (2.2.21)
-    rack-protection (3.2.0)
-      base64 (>= 0.1.0)
+    racc (1.7.1-java)
+    rack (2.2.8)
+    rack-protection (3.1.0)
       rack (~> 2.2, >= 2.2.4)
-    rake (13.3.1)
-    rbvmomi2 (3.8.0)
+    rake (13.0.6)
+    rbvmomi2 (3.7.0)
       builder (~> 3.2)
       json (~> 2.3)
       nokogiri (~> 1.12, >= 1.12.5)
       optimist (~> 3.0)
-    redis (5.4.1)
-      redis-client (>= 0.22.0)
-    redis-client (0.26.3)
+    redis (5.0.7)
+      redis-client (>= 0.9.0)
+    redis-client (0.17.0)
       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.4)
+    rexml (3.2.6)
     ruby2_keywords (0.0.5)
-    signet (0.21.0)
+    signet (0.18.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 4.0)
+      jwt (>= 1.5, < 3.0)
       multi_json (~> 1.10)
-    sinatra (3.2.0)
+    sinatra (3.1.0)
       mustermann (~> 3.0)
       rack (~> 2.2, >= 2.2.4)
-      rack-protection (= 3.2.0)
+      rack-protection (= 3.1.0)
       tilt (~> 2.0)
     spicy-proton (2.1.15)
       bindata (~> 2.3)
     statsd-ruby (1.5.0)
-    thrift (0.22.0)
-    tilt (2.7.0)
+    thrift (0.19.0)
+    tilt (2.3.0)
     trailblazer-option (0.1.2)
     uber (0.1.0)
-    uri (1.1.1)
-    vmpooler (3.8.1)
+    vmpooler (3.6.0)
       concurrent-ruby (~> 1.1)
       connection_pool (~> 2.4)
       deep_merge (~> 1.2)
@@ -168,11 +155,10 @@ GEM
       opentelemetry-exporter-jaeger (= 0.23.0)
       opentelemetry-instrumentation-concurrent_ruby (= 0.21.1)
       opentelemetry-instrumentation-http_client (= 0.22.2)
-      opentelemetry-instrumentation-rack (= 0.23.4)
       opentelemetry-instrumentation-redis (= 0.25.3)
       opentelemetry-instrumentation-sinatra (= 0.23.2)
       opentelemetry-resource_detectors (= 0.24.2)
-      opentelemetry-sdk (~> 1.8)
+      opentelemetry-sdk (~> 1.3, >= 1.3.0)
       pickup (~> 0.0.11)
       prometheus-client (>= 2, < 5)
       puma (>= 5.0.4, < 7)
@@ -193,6 +179,7 @@ GEM
     vmpooler-provider-vsphere (3.3.4)
       rbvmomi2 (>= 3.1, < 4.0)
       vmpooler (~> 3.0)
+    webrick (1.8.1)
     zonefile (1.06)
 
 PLATFORMS
diff --git a/docs/index.yaml b/docs/index.yaml
index a00122b..c6ff543 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -1,69 +1,9 @@
 apiVersion: v1
 entries:
   vmpooler:
-  - apiVersion: v2
-    appVersion: 5.7.0
-    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
-      version: 16.13.2
-    description: A Helm chart to deploy vmpooler
-    digest: 0b6a59f120583298798b6641929924257d8b004acac12e8435736480ad15da9b
-    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.0.tgz
-    version: 3.9.0
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-08-01T14:47:26.499359292Z"
-    dependencies:
-    - name: redis
-      repository: https://charts.bitnami.com/bitnami
-      version: 16.13.2
-    description: A Helm chart to deploy vmpooler
-    digest: 80ed97d541895fb564463e30bb3092969a037450c714f5d1985ca42acc0af39c
-    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.8.3.tgz
-    version: 3.8.3
-  - apiVersion: v2
-    appVersion: 5.6.0
-    created: "2025-08-01T14:47:26.488598934Z"
+    created: "2024-07-25T19:05:15.67074286Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +18,7 @@ entries:
     version: 3.8.2
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-08-01T14:47:26.476360664Z"
+    created: "2024-07-25T19:05:15.665654168Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +33,7 @@ entries:
     version: 3.8.1
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-08-01T14:47:26.465872839Z"
+    created: "2024-07-25T19:05:15.661195101Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +48,7 @@ entries:
     version: 3.8.0
   - apiVersion: v2
     appVersion: 5.6.0
-    created: "2025-08-01T14:47:26.454823621Z"
+    created: "2024-07-25T19:05:15.656151726Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +63,7 @@ entries:
     version: 3.7.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2025-08-01T14:47:26.444772227Z"
+    created: "2024-07-25T19:05:15.651704149Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +78,7 @@ entries:
     version: 3.6.0
   - apiVersion: v2
     appVersion: 5.5.3
-    created: "2025-08-01T14:47:26.433931552Z"
+    created: "2024-07-25T19:05:15.646623782Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +93,7 @@ entries:
     version: 3.5.3
   - apiVersion: v2
     appVersion: 5.5.2
-    created: "2025-08-01T14:47:26.424035301Z"
+    created: "2024-07-25T19:05:15.641916926Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +108,7 @@ entries:
     version: 3.5.2
   - apiVersion: v2
     appVersion: 5.5.1
-    created: "2025-08-01T14:47:26.411819215Z"
+    created: "2024-07-25T19:05:15.636802738Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +123,7 @@ entries:
     version: 3.5.1
   - apiVersion: v2
     appVersion: 5.5.0
-    created: "2025-08-01T14:47:26.401583826Z"
+    created: "2024-07-25T19:05:15.632409341Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +138,7 @@ entries:
     version: 3.5.0
   - apiVersion: v2
     appVersion: 5.4.1
-    created: "2025-08-01T14:47:26.390414322Z"
+    created: "2024-07-25T19:05:15.627474343Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +153,7 @@ entries:
     version: 3.4.1
   - apiVersion: v2
     appVersion: 5.4.0
-    created: "2025-08-01T14:47:26.379928244Z"
+    created: "2024-07-25T19:05:15.622458285Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +168,7 @@ entries:
     version: 3.4.0
   - apiVersion: v2
     appVersion: 5.3.0
-    created: "2025-08-01T14:47:26.368518543Z"
+    created: "2024-07-25T19:05:15.618023589Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -243,7 +183,7 @@ entries:
     version: 3.3.0
   - apiVersion: v2
     appVersion: 5.2.0
-    created: "2025-08-01T14:47:26.358252054Z"
+    created: "2024-07-25T19:05:15.613179807Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -258,7 +198,7 @@ entries:
     version: 3.2.0
   - apiVersion: v2
     appVersion: 5.1.0
-    created: "2025-08-01T14:47:26.346223906Z"
+    created: "2024-07-25T19:05:15.608809137Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -273,7 +213,7 @@ entries:
     version: 3.1.0
   - apiVersion: v2
     appVersion: 5.0.0
-    created: "2025-08-01T14:47:26.336021044Z"
+    created: "2024-07-25T19:05:15.603749396Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -288,7 +228,7 @@ entries:
     version: 3.0.0
   - apiVersion: v2
     appVersion: 4.1.0
-    created: "2025-08-01T14:47:26.324819648Z"
+    created: "2024-07-25T19:05:15.599204097Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -303,7 +243,7 @@ entries:
     version: 2.2.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2025-08-01T14:47:26.314076098Z"
+    created: "2024-07-25T19:05:15.59405581Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -318,7 +258,7 @@ entries:
     version: 2.1.0
   - apiVersion: v2
     appVersion: 4.0.0
-    created: "2025-08-01T14:47:26.3025029Z"
+    created: "2024-07-25T19:05:15.589011682Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -333,7 +273,7 @@ entries:
     version: 2.0.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-08-01T14:47:26.217686479Z"
+    created: "2024-07-25T19:05:15.561029532Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -348,7 +288,7 @@ entries:
     version: 1.19.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-08-01T14:47:26.20615313Z"
+    created: "2024-07-25T19:05:15.556214952Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -363,7 +303,7 @@ entries:
     version: 1.18.0
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2025-08-01T14:47:26.192913076Z"
+    created: "2024-07-25T19:05:15.55158747Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -378,7 +318,7 @@ entries:
     version: 1.17.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-08-01T14:47:26.180016696Z"
+    created: "2024-07-25T19:05:15.546230311Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -393,7 +333,7 @@ entries:
     version: 1.16.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-08-01T14:47:26.163482559Z"
+    created: "2024-07-25T19:05:15.541606242Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -408,7 +348,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2025-08-01T14:47:26.148027262Z"
+    created: "2024-07-25T19:05:15.536265901Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -423,7 +363,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2025-08-01T14:47:26.129088412Z"
+    created: "2024-07-25T19:05:15.531548972Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -438,7 +378,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2025-08-01T14:47:26.115192635Z"
+    created: "2024-07-25T19:05:15.526198893Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -453,7 +393,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2025-08-01T14:47:26.104012949Z"
+    created: "2024-07-25T19:05:15.522523335Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -468,7 +408,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2025-08-01T14:47:26.094249573Z"
+    created: "2024-07-25T19:05:15.518369559Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -483,7 +423,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-08-01T14:47:26.08366946Z"
+    created: "2024-07-25T19:05:15.514654153Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -498,7 +438,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-08-01T14:47:26.073735253Z"
+    created: "2024-07-25T19:05:15.509411711Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -513,7 +453,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-08-01T14:47:26.292230858Z"
+    created: "2024-07-25T19:05:15.584362691Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -528,7 +468,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2025-08-01T14:47:26.282594053Z"
+    created: "2024-07-25T19:05:15.581633472Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -543,7 +483,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2025-08-01T14:47:26.274204699Z"
+    created: "2024-07-25T19:05:15.57830401Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -558,7 +498,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2025-08-01T14:47:26.265409971Z"
+    created: "2024-07-25T19:05:15.575519157Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -573,7 +513,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-08-01T14:47:26.256953201Z"
+    created: "2024-07-25T19:05:15.572727959Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -588,7 +528,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-08-01T14:47:26.246802746Z"
+    created: "2024-07-25T19:05:15.569518121Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -603,7 +543,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-08-01T14:47:26.238207026Z"
+    created: "2024-07-25T19:05:15.566756207Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -618,7 +558,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2025-08-01T14:47:26.228886776Z"
+    created: "2024-07-25T19:05:15.564016545Z"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -631,4 +571,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2025-08-01T14:47:26.062605037Z"
+generated: "2024-07-25T19:05:15.503214981Z"
diff --git a/docs/vmpooler-3.8.3.tgz b/docs/vmpooler-3.8.3.tgz
deleted file mode 100644
index e7fba63..0000000
Binary files a/docs/vmpooler-3.8.3.tgz and /dev/null differ
diff --git a/docs/vmpooler-3.9.0.tgz b/docs/vmpooler-3.9.0.tgz
deleted file mode 100644
index fdffed4..0000000
Binary files a/docs/vmpooler-3.9.0.tgz and /dev/null differ
diff --git a/docs/vmpooler-3.9.1.tgz b/docs/vmpooler-3.9.1.tgz
deleted file mode 100644
index 1eb3b0e..0000000
Binary files a/docs/vmpooler-3.9.1.tgz and /dev/null differ
diff --git a/helm-charts/vmpooler/Chart.lock b/helm-charts/vmpooler/Chart.lock
index 3c00010..d5fddf2 100644
--- a/helm-charts/vmpooler/Chart.lock
+++ b/helm-charts/vmpooler/Chart.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: redis
-  repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+  repository: https://charts.bitnami.com/bitnami
   version: 16.13.2
-digest: sha256:9f085fa04b66dea3610b03474b3eb2e2fd09733c4c6cbbda15a152770a9169b0
-generated: "2025-07-31T09:10:07.046655-07:00"
+digest: sha256:3a3d3cfce254ddfa488e495a3e2e141ee59c0ea4a583ba813093def78ca132cb
+generated: "2023-01-24T12:41:13.082268468Z"
diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml
index 87822f9..3e0d7ac 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.10.0
-appVersion: 5.8.0
+version: 3.8.2
+appVersion: 5.6.0
 dependencies:
   - name: redis
-    repository: https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+    repository: https://charts.bitnami.com/bitnami
     version: 16.13.2
diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml
index e251dfa..e67e8c0 100644
--- a/helm-charts/vmpooler/values.yaml
+++ b/helm-charts/vmpooler/values.yaml
@@ -70,7 +70,7 @@ api:
       memory: 2Gi
     limits:
       cpu: 2000m
-      memory: 4Gi
+      memory: 2Gi
 
 manager:
   resources:
@@ -130,12 +130,6 @@ 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:
@@ -170,11 +164,6 @@ 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 d5e9b07..a172c6a 100644
--- a/helm-package
+++ b/helm-package
@@ -3,7 +3,7 @@
 set -e
 set -x
 
-helm repo add artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local
+helm repo add bitnami https://charts.bitnami.com/bitnami
 cd /apps/helm-charts/vmpooler
 helm dependency update
 cd /apps/docs
diff --git a/update-chart-lock b/update-chart-lock
index dff98f5..8748596 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 artifactory https://artifactory.delivery.puppetlabs.net/artifactory/helm__local && cd /apps/helm-charts/vmpooler && helm dependency update'
+  -c 'helm repo add bitnami https://charts.bitnami.com/bitnami && cd /apps/helm-charts/vmpooler && helm dependency update'