diff --git a/packer/jambonz-feature-server/files/ecosystem.config.js b/packer/jambonz-feature-server/files/ecosystem.config.js
index bc0a040..288b5c7 100644
--- a/packer/jambonz-feature-server/files/ecosystem.config.js
+++ b/packer/jambonz-feature-server/files/ecosystem.config.js
@@ -14,6 +14,7 @@ module.exports = {
     env: {
       NODE_ENV: 'production',
       JWT_SECRET: 'JWT-SECRET-GOES_HERE',
+      JAMBONES_GATHER_EARLY_HINTS_MATCH: 1,
       ENABLE_DATADOG_METRICS: 0,
       JAMBONES_NETWORK_CIDR: '172.31.32.0/24',
       JAMBONES_MYSQL_HOST: '${JAMBONES_MYSQL_HOST}',
diff --git a/packer/jambonz-feature-server/template.json b/packer/jambonz-feature-server/template.json
index 17b2175..f15d0f7 100644
--- a/packer/jambonz-feature-server/template.json
+++ b/packer/jambonz-feature-server/template.json
@@ -4,8 +4,8 @@
     "ssh_username": "admin",
     "ami_description": "jambonz feature server",
     "instance_type": "t2.xlarge",
-    "drachtio_version": "v0.8.21-rc4",
-    "jambonz_version": "v0.8.0",
+    "drachtio_version": "v0.8.21",
+    "jambonz_version": "v0.8.1",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "install_telegraf": "yes",
diff --git a/packer/jambonz-mini/files/ecosystem.config.js b/packer/jambonz-mini/files/ecosystem.config.js
index 3e22298..daf9b3e 100644
--- a/packer/jambonz-mini/files/ecosystem.config.js
+++ b/packer/jambonz-mini/files/ecosystem.config.js
@@ -255,6 +255,7 @@ module.exports = {
     env: {
       NODE_ENV: 'production',
       JWT_SECRET: 'JWT-SECRET-GOES_HERE',
+      JAMBONES_GATHER_EARLY_HINTS_MATCH: 1,
       JAMBONES_OTEL_ENABLED: 1,
       OTEL_EXPORTER_JAEGER_ENDPOINT: 'http://localhost:14268/api/traces',
       OTEL_EXPORTER_OTLP_METRICS_INSECURE: 1,
diff --git a/packer/jambonz-mini/template.json b/packer/jambonz-mini/template.json
index 47d3fe7..b7f1788 100644
--- a/packer/jambonz-mini/template.json
+++ b/packer/jambonz-mini/template.json
@@ -4,8 +4,8 @@
     "ssh_username": "admin",
     "ami_description": "jambonz all-in-one AMI", 
     "instance_type": "t2.xlarge",
-    "drachtio_version": "v0.8.21-rc4",
-    "jambonz_version": "v0.8.0",
+    "drachtio_version": "v0.8.21",
+    "jambonz_version": "v0.8.1",
     "jambonz_user": "admin",
     "jambonz_password": "JambonzR0ck$",
     "install_telegraf": "yes",
diff --git a/packer/jambonz-monitoring/template.json b/packer/jambonz-monitoring/template.json
index cd3ad7d..0652154 100644
--- a/packer/jambonz-monitoring/template.json
+++ b/packer/jambonz-monitoring/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz monitoring server", 
     "instance_type": "t2.xlarge",
-    "jambonz_version": "v0.8.0",
+    "jambonz_version": "v0.8.1",
     "homer_user": "homer_user",
     "homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI",
     "install_influxdb":  "yes",
diff --git a/packer/jambonz-sbc-rtp/template.json b/packer/jambonz-sbc-rtp/template.json
index 56d2a89..4b0314f 100644
--- a/packer/jambonz-sbc-rtp/template.json
+++ b/packer/jambonz-sbc-rtp/template.json
@@ -3,8 +3,8 @@
     "region": "us-east-1",
     "ssh_username": "admin",
     "ami_description": "jambonz SBC RTP server", 
-    "drachtio_version": "v0.8.21-rc4",
-    "jambonz_version": "v0.8.0",
+    "drachtio_version": "v0.8.21",
+    "jambonz_version": "v0.8.1",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "instance_type": "t3.xlarge",
diff --git a/packer/jambonz-sbc-sip/template.json b/packer/jambonz-sbc-sip/template.json
index 22a1e53..01a0789 100644
--- a/packer/jambonz-sbc-sip/template.json
+++ b/packer/jambonz-sbc-sip/template.json
@@ -4,8 +4,8 @@
     "ssh_username": "admin",
     "ami_description": "jambonz SBC SIP", 
     "instance_type": "t3.xlarge",
-    "drachtio_version": "v0.8.21-rc4",
-    "jambonz_version": "v0.8.0",
+    "drachtio_version": "v0.8.21",
+    "jambonz_version": "v0.8.1",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "install_datadog": "no",
diff --git a/packer/jambonz-web-server/template.json b/packer/jambonz-web-server/template.json
index ca7a342..09b9418 100644
--- a/packer/jambonz-web-server/template.json
+++ b/packer/jambonz-web-server/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz webserver", 
     "instance_type": "t3.xlarge",
-    "jambonz_version": "v0.8.0",
+    "drachtio_version": "v0.8.21",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "install_datadog": "no",