diff --git a/docker/dev/docker-compose.yml b/docker/dev/docker-compose.yml
index 21b179d..404deff 100644
--- a/docker/dev/docker-compose.yml
+++ b/docker/dev/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
@@ -42,7 +41,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
diff --git a/docker/prod-all-providers/docker-compose.yml b/docker/prod-all-providers/docker-compose.yml
index 415a04c..d93a8bb 100644
--- a/docker/prod-all-providers/docker-compose.yml
+++ b/docker/prod-all-providers/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
@@ -42,7 +41,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
diff --git a/docker/test-all-providers/docker-compose.yml b/docker/test-all-providers/docker-compose.yml
index 415a04c..d93a8bb 100644
--- a/docker/test-all-providers/docker-compose.yml
+++ b/docker/test-all-providers/docker-compose.yml
@@ -18,7 +18,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
@@ -42,7 +41,6 @@ services:
       - VMPOOLER_CONFIG_FILE=/etc/vmpooler/vmpooler.yaml
       - REDIS_SERVER=redislocal
       - LOGFILE=/dev/null
-      - JRUBY_OPTS=-Xinvokedynamic.yield=false
       - VMPOOLER_TRACING_ENABLED=true
       - VMPOOLER_TRACING_JAEGER_HOST=http://jaeger-aio:14268/api/traces
     image: vmpooler-local
diff --git a/docs/index.yaml b/docs/index.yaml
index 23df7cc..d9a3914 100644
--- a/docs/index.yaml
+++ b/docs/index.yaml
@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.7.0-prod-all-providers
-    created: "2022-07-25T12:26:34.958706-05:00"
+    created: "2022-07-26T09:02:53.10743-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: 3bba114db08966a44c7448130cbf11fdfc0e749ba08a096a20333928286bf9f7
+    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-1.18.0.tgz
+    version: 1.18.0
+  - apiVersion: v2
+    appVersion: 1.7.0-prod-all-providers
+    created: "2022-07-26T09:02:53.10191-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.17.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-25T12:26:34.952781-05:00"
+    created: "2022-07-26T09:02:53.095376-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.16.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-25T12:26:34.947525-05:00"
+    created: "2022-07-26T09:02:53.072716-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-25T12:26:34.941787-05:00"
+    created: "2022-07-26T09:02:53.062114-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-25T12:26:34.935877-05:00"
+    created: "2022-07-26T09:02:53.053642-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-25T12:26:34.930196-05:00"
+    created: "2022-07-26T09:02:53.043694-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-07-25T12:26:34.925042-05:00"
+    created: "2022-07-26T09:02:53.024266-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-07-25T12:26:34.920512-05:00"
+    created: "2022-07-26T09:02:53.016888-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-25T12:26:34.916225-05:00"
+    created: "2022-07-26T09:02:53.009934-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-25T12:26:34.910973-05:00"
+    created: "2022-07-26T09:02:53.000152-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-25T12:26:34.986422-05:00"
+    created: "2022-07-26T09:02:53.199957-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-25T12:26:34.983293-05:00"
+    created: "2022-07-26T09:02:53.192071-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-25T12:26:34.980098-05:00"
+    created: "2022-07-26T09:02:53.169331-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-25T12:26:34.976403-05:00"
+    created: "2022-07-26T09:02:53.161587-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-25T12:26:34.973381-05:00"
+    created: "2022-07-26T09:02:53.154765-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +243,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-25T12:26:34.969621-05:00"
+    created: "2022-07-26T09:02:53.141575-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -243,7 +258,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-25T12:26:34.96642-05:00"
+    created: "2022-07-26T09:02:53.121686-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -258,7 +273,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-25T12:26:34.96315-05:00"
+    created: "2022-07-26T09:02:53.114677-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -271,4 +286,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-07-25T12:26:34.905631-05:00"
+generated: "2022-07-26T09:02:52.984817-05:00"
diff --git a/docs/vmpooler-1.18.0.tgz b/docs/vmpooler-1.18.0.tgz
new file mode 100644
index 0000000..03240b3
Binary files /dev/null and b/docs/vmpooler-1.18.0.tgz differ
diff --git a/helm-charts/vmpooler/Chart.yaml b/helm-charts/vmpooler/Chart.yaml
index 9ba5b0a..c1c2852 100644
--- a/helm-charts/vmpooler/Chart.yaml
+++ b/helm-charts/vmpooler/Chart.yaml
@@ -3,7 +3,7 @@ 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: 1.17.0
+version: 1.18.0
 appVersion: 1.7.0-prod-all-providers
 dependencies:
   - name: redis
diff --git a/helm-charts/vmpooler/templates/deployment-manager.yaml b/helm-charts/vmpooler/templates/deployment-manager.yaml
index 294390c..f66f25d 100644
--- a/helm-charts/vmpooler/templates/deployment-manager.yaml
+++ b/helm-charts/vmpooler/templates/deployment-manager.yaml
@@ -68,7 +68,7 @@ spec:
         - name: AWS_KEY_FILE_LOCATION
           value: '{{ .Values.ec2.keyfile }}'
         - name: JRUBY_OPTS
-          value: '-J-XX:+UseG1GC -Xinvokedynamic.yield=false'
+          value: '-J-XX:+UseG1GC'
         - name: TASK_LIMIT
           value: '30'
         - name: MIGRATION_LIMIT