fix: use TTS_FAILURE alert type for synthAudio

2026-01-25 02:07:56 +00:00 · 2023-03-08 19:36:23 +07:00
49 changed files with 1906 additions and 4917 deletions
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -2,8 +2,16 @@ name: Docker

 on:
  push:
+    # Publish `main` as Docker `latest` image.
+    branches:
+      - main
+
+    # Publish `v1.2.3` tags as releases.
    tags:
-      - '*'
+      - v*
+
+env:
+  IMAGE_NAME: feature-server

 jobs:
  push:
@@ -12,41 +20,32 @@ jobs:
    if: github.event_name == 'push'

    steps:
-      - name: Checkout code
-        uses: actions/checkout@v3
+      - uses: actions/checkout@v3

-      - name: prepare tag 
-        id: prepare_tag
+      - name: Build image
+        run: docker build . --file Dockerfile --tag $IMAGE_NAME
+
+      - name: Log into registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Push image
        run: |
-            IMAGE_ID=feature-server
+          IMAGE_ID=ghcr.io/${{ github.repository_owner }}/$IMAGE_NAME

-            # Strip git ref prefix from version
-            VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')
+          # Change all uppercase to lowercase
+          IMAGE_ID=$(echo $IMAGE_ID | tr '[A-Z]' '[a-z]')

-            # Strip "v" prefix from tag name
-            [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')
+          # Strip git ref prefix from version
+          VERSION=$(echo "${{ github.ref }}" | sed -e 's,.*/\(.*\),\1,')

-            # Use Docker `latest` tag convention
-            [ "$VERSION" == "main" ] && VERSION=latest
+          # Strip "v" prefix from tag name
+          [[ "${{ github.ref }}" == "refs/tags/"* ]] && VERSION=$(echo $VERSION | sed -e 's/^v//')

-            echo IMAGE_ID=$IMAGE_ID
-            echo VERSION=$VERSION
+          # Use Docker `latest` tag convention
+          [ "$VERSION" == "main" ] && VERSION=latest

-            echo "image_id=$IMAGE_ID" >> $GITHUB_OUTPUT
-            echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo IMAGE_ID=$IMAGE_ID
+          echo VERSION=$VERSION

-      - name: Login to Docker Hub 
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.prepare_tag.outputs.image_id }}:${{ steps.prepare_tag.outputs.version }}
-          build-args: |
-            GITHUB_REPOSITORY=$GITHUB_REPOSITORY
-            GITHUB_REF=$GITHUB_REF
+          docker tag $IMAGE_NAME $IMAGE_ID:$VERSION
+          docker push $IMAGE_ID:$VERSION
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM --platform=linux/amd64 node:18.15-alpine3.16 as base
+FROM --platform=linux/amd64 node:18.14.1-alpine3.16 as base

 RUN apk --update --no-cache add --virtual .builds-deps build-base python3

--- a/README.md
+++ b/README.md
@@ -18,7 +18,6 @@ Configuration is provided via environment variables:
 |DRACHTIO_PORT| listening port of drachtio server for control connections (typically 9022)|yes|
 |DRACHTIO_SECRET| shared secret|yes|
 |ENABLE_METRICS| if 1, metrics will be generated|no|
-|ENCRYPTION_SECRET| secret for credential encryption(JWT_SECRET is deprecated) |yes|
 |GOOGLE_APPLICATION_CREDENTIALS| path to gcp service key file|yes|
 |HTTP_PORT| tcp port to listen on for API requests from jambonz-api-server|yes|
 |JAMBONES_GATHER_EARLY_HINTS_MATCH| if true and hints are provided, gather will opportunistically review interim transcripts if possible to reduce ASR latency |no|
@@ -89,4 +88,4 @@ module.exports = {

 #### Running the test suite

-Please [see this](./docs/contributing.md#run-the-regression-test-suite).
+Please [see this]](./docs/contributing.md#run-the-regression-test-suite).
--- a/app.js
+++ b/app.js
@@ -1,26 +1,21 @@
-const {
-  DRACHTIO_PORT,
-  DRACHTIO_HOST,
-  DRACHTIO_SECRET,
-  JAMBONES_OTEL_SERVICE_NAME,
-  JAMBONES_LOGLEVEL,
-  JAMBONES_CLUSTER_ID,
-  JAMBONZ_CLEANUP_INTERVAL_MINS,
-  getCleanupIntervalMins,
-  K8S,
-  NODE_ENV,
-  checkEnvs,
-} = require('./lib/config');
-
-checkEnvs();
+const assert = require('assert');
+assert.ok(process.env.JAMBONES_MYSQL_HOST &&
+  process.env.JAMBONES_MYSQL_USER &&
+  process.env.JAMBONES_MYSQL_PASSWORD &&
+  process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
+assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
+assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
+assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
+assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
+assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');

 const Srf = require('drachtio-srf');
 const srf = new Srf();
-const tracer = require('./tracer')(JAMBONES_OTEL_SERVICE_NAME);
+const tracer = require('./tracer')(process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server');
 const api = require('@opentelemetry/api');
 srf.locals = {...srf.locals, otel: {tracer, api}};

-const opts = {level: JAMBONES_LOGLEVEL};
+const opts = {level: process.env.JAMBONES_LOGLEVEL || 'info'};
 const pino = require('pino');
 const logger = pino(opts, pino.destination({sync: false}));
 const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./lib/utils/constants');
@@ -40,8 +35,8 @@ const {
 const InboundCallSession = require('./lib/session/inbound-call-session');
 const SipRecCallSession = require('./lib/session/siprec-call-session');

-if (DRACHTIO_HOST) {
-  srf.connect({host: DRACHTIO_HOST, port: DRACHTIO_PORT, secret: DRACHTIO_SECRET });
+if (process.env.DRACHTIO_HOST) {
+  srf.connect({host: process.env.DRACHTIO_HOST, port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET });
  srf.on('connect', (err, hp) => {
    const arr = /^(.*)\/(.*)$/.exec(hp.split(',').pop());
    srf.locals.localSipAddress = `${arr[2]}`;
@@ -49,10 +44,10 @@ if (DRACHTIO_HOST) {
  });
 }
 else {
-  logger.info(`listening for drachtio requests on port ${DRACHTIO_PORT}`);
-  srf.listen({port: DRACHTIO_PORT, secret: DRACHTIO_SECRET});
+  logger.info(`listening for drachtio requests on port ${process.env.DRACHTIO_PORT}`);
+  srf.listen({port: process.env.DRACHTIO_PORT, secret: process.env.DRACHTIO_SECRET});
 }
-if (NODE_ENV === 'test') {
+if (process.env.NODE_ENV === 'test') {
  srf.on('error', (err) => {
    logger.info(err, 'Error connecting to drachtio');
  });
@@ -117,13 +112,13 @@ function handle(signal) {
  const {removeFromSet} = srf.locals.dbHelpers;
  srf.locals.disabled = true;
  logger.info(`got signal ${signal}`);
-  const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
+  const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-fs`;
  if (setName && srf.locals.localSipAddress) {
    logger.info(`got signal ${signal}, removing ${srf.locals.localSipAddress} from set ${setName}`);
    removeFromSet(setName, srf.locals.localSipAddress);
  }
  removeFromSet(FS_UUID_SET_NAME, srf.locals.fsUUID);
-  if (K8S) {
+  if (process.env.K8S) {
    srf.locals.lifecycleEmitter.operationalState = LifeCycleEvents.ScaleIn;
  }
  if (getCount() === 0) {
@@ -132,7 +127,7 @@ function handle(signal) {
  }
 }

-if (JAMBONZ_CLEANUP_INTERVAL_MINS) {
+if (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS) {
  const {clearFiles} = require('./lib/utils/cron-jobs');

  /* cleanup orphaned files or channels every so often */
@@ -142,7 +137,7 @@ if (JAMBONZ_CLEANUP_INTERVAL_MINS) {
    } catch (err) {
      logger.error({err}, 'app.js: error clearing files');
    }
-  }, getCleanupIntervalMins());
+  }, 1000 * 60 * (process.env.JAMBONZ_CLEANUP_INTERVAL_MINS || 60));
 }

 module.exports = {srf, logger, disconnect};
--- a/bin/k8s-pre-stop-hook.js
+++ b/bin/k8s-pre-stop-hook.js
@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 const bent = require('bent');
 const getJSON = bent('json');
-const {PORT} = require('../lib/config')
+const PORT = process.env.HTTP_PORT || 3000;

 const sleep = (ms) => {
  return new Promise((resolve) => setTimeout(resolve, ms));
--- a/data/example-voicemail-greetings.json
+++ b/data/example-voicemail-greetings.json
@@ -5,11 +5,14 @@
    "at the tone",
    "leave a message",
    "leave me a message",
-    "not available",
+    "not available right now",
+    "not available to take your call",
    "can't take your call",
-    "will get back to you",
+    "I will get back to you",
    "I'll get back to you",
-    "we are unable"
+    "we will get back to you",
+    "we are unable",
+    "we are not available"
  ],
  "es-ES": [
    "le pasamos la llamada",
@@ -45,18 +48,5 @@
    "ens posarem en contacto",
    "ara no estem disponibles",
    "no hi som"
-  ],
-  "de-DE": [
-    "nicht erreichbar",
-    "nnruf wurde weitergeleitet",
-    "beim piepsen",
-    "am ton",
-    "eine nachricht hinterlassen",
-    "hinterlasse mir eine Nachricht",
-    "nicht verfügbar",
-    "kann ihren anruf nicht entgegennehmen",
-    "wird sich bei Ihnen melden",
-    "ich melde mich bei dir",
-    "wir können nicht"
  ]
 }
--- a/lib/config.js
+++ b/lib/config.js
@@ -1,195 +0,0 @@
-const assert = require('assert');
-
-const checkEnvs = () => {
-  assert.ok(process.env.JAMBONES_MYSQL_HOST &&
-		process.env.JAMBONES_MYSQL_USER &&
-		process.env.JAMBONES_MYSQL_PASSWORD &&
-		process.env.JAMBONES_MYSQL_DATABASE, 'missing JAMBONES_MYSQL_XXX env vars');
-  assert.ok(process.env.DRACHTIO_PORT || process.env.DRACHTIO_HOST, 'missing DRACHTIO_PORT env var');
-  assert.ok(process.env.DRACHTIO_SECRET, 'missing DRACHTIO_SECRET env var');
-  assert.ok(process.env.JAMBONES_FREESWITCH, 'missing JAMBONES_FREESWITCH env var');
-  assert.ok(process.env.JAMBONES_REDIS_HOST, 'missing JAMBONES_REDIS_HOST env var');
-  assert.ok(process.env.JAMBONES_NETWORK_CIDR || process.env.K8S, 'missing JAMBONES_SUBNET env var');
-};
-
-const NODE_ENV = process.env.NODE_ENV;
-
-/* database mySQL */
-const JAMBONES_MYSQL_HOST = process.env.JAMBONES_MYSQL_HOST;
-const JAMBONES_MYSQL_USER = process.env.JAMBONES_MYSQL_USER;
-const JAMBONES_MYSQL_PASSWORD = process.env.JAMBONES_MYSQL_PASSWORD;
-const JAMBONES_MYSQL_DATABASE = process.env.JAMBONES_MYSQL_DATABASE;
-const JAMBONES_MYSQL_PORT = parseInt(process.env.JAMBONES_MYSQL_PORT, 10) || 3306;
-const JAMBONES_MYSQL_REFRESH_TTL = process.env.JAMBONES_MYSQL_REFRESH_TTL;
-const JAMBONES_MYSQL_CONNECTION_LIMIT = parseInt(process.env.JAMBONES_MYSQL_CONNECTION_LIMIT, 10) || 10;
-
-/* redis */
-const JAMBONES_REDIS_HOST = process.env.JAMBONES_REDIS_HOST;
-const JAMBONES_REDIS_PORT = parseInt(process.env.JAMBONES_REDIS_PORT, 10) || 6379;
-
-/* gather and hints */
-const JAMBONES_GATHER_EARLY_HINTS_MATCH = process.env.JAMBONES_GATHER_EARLY_HINTS_MATCH;
-const JAMBONZ_GATHER_EARLY_HINTS_MATCH = process.env.JAMBONZ_GATHER_EARLY_HINTS_MATCH;
-const JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS = process.env.JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS;
-
-const SMPP_URL = process.env.SMPP_URL;
-
-/* drachtio */
-const DRACHTIO_PORT = process.env.DRACHTIO_PORT;
-const DRACHTIO_HOST = process.env.DRACHTIO_HOST;
-const DRACHTIO_SECRET = process.env.DRACHTIO_SECRET;
-
-/* freeswitch */
-const JAMBONES_API_BASE_URL = process.env.JAMBONES_API_BASE_URL;
-const JAMBONES_FREESWITCH = process.env.JAMBONES_FREESWITCH;
-const JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS = parseInt(process.env.JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS, 10)
-	|| 180;
-
-
-const JAMBONES_SBCS = process.env.JAMBONES_SBCS;
-
-/* websockets */
-const JAMBONES_WS_HANDSHAKE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS, 10) || 1500;
-const JAMBONES_WS_MAX_PAYLOAD = parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD, 10) || 24 * 1024;
-
-const MAX_RECONNECTS = 5;
-const RESPONSE_TIMEOUT_MS = parseInt(process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT, 10) || 5000;
-
-const JAMBONES_NETWORK_CIDR = process.env.JAMBONES_NETWORK_CIDR;
-const JAMBONES_TIME_SERIES_HOST = process.env.JAMBONES_TIME_SERIES_HOST;
-const JAMBONES_CLUSTER_ID = process.env.JAMBONES_CLUSTER_ID || 'default';
-const JAMBONES_ESL_LISTEN_ADDRESS = process.env.JAMBONES_ESL_LISTEN_ADDRESS;
-
-/* tracing */
-const JAMBONES_OTEL_ENABLED = process.env.JAMBONES_OTEL_ENABLED;
-const JAMBONES_OTEL_SERVICE_NAME = process.env.JAMBONES_OTEL_SERVICE_NAME || 'jambonz-feature-server';
-const OTEL_EXPORTER_JAEGER_AGENT_HOST = process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST;
-const OTEL_EXPORTER_JAEGER_ENDPOINT = process.env.OTEL_EXPORTER_JAEGER_ENDPOINT;
-const OTEL_EXPORTER_ZIPKIN_URL = process.env.OTEL_EXPORTER_ZIPKIN_URL;
-const OTEL_EXPORTER_COLLECTOR_URL = process.env.OTEL_EXPORTER_COLLECTOR_URL;
-
-const JAMBONES_LOGLEVEL = process.env.JAMBONES_LOGLEVEL || 'info';
-const JAMBONES_INJECT_CONTENT = process.env.JAMBONES_INJECT_CONTENT;
-
-const PORT = parseInt(process.env.HTTP_PORT, 10) || 3000;
-const HTTP_PORT_MAX = parseInt(process.env.HTTP_PORT_MAX, 10);
-
-const K8S = process.env.K8S;
-const K8S_SBC_SIP_SERVICE_NAME = process.env.K8S_SBC_SIP_SERVICE_NAME;
-
-const JAMBONES_SUBNET = process.env.JAMBONES_SUBNET;
-
-/* clean up */
-const JAMBONZ_CLEANUP_INTERVAL_MINS = process.env.JAMBONZ_CLEANUP_INTERVAL_MINS;
-const getCleanupIntervalMins = () => {
-  const interval = parseInt(JAMBONZ_CLEANUP_INTERVAL_MINS, 10) || 60;
-  return 1000 * 60 * interval;
-};
-
-/* speech vendors */
-const AWS_REGION = process.env.AWS_REGION;
-const AWS_ACCESS_KEY_ID = process.env.AWS_ACCESS_KEY_ID;
-const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
-const AWS_SNS_PORT = parseInt(process.env.AWS_SNS_PORT, 10) || 3001;
-const AWS_SNS_TOPIC_ARM = process.env.AWS_SNS_TOPIC_ARM;
-const AWS_SNS_PORT_MAX = parseInt(process.env.AWS_SNS_PORT_MAX, 10) || 3005;
-
-const GCP_JSON_KEY = process.env.GCP_JSON_KEY;
-
-const MICROSOFT_REGION = process.env.MICROSOFT_REGION;
-const MICROSOFT_API_KEY = process.env.MICROSOFT_API_KEY;
-
-const SONIOX_API_KEY = process.env.SONIOX_API_KEY;
-
-const DEEPGRAM_API_KEY = process.env.DEEPGRAM_API_KEY;
-
-const ANCHOR_MEDIA_ALWAYS = process.env.ANCHOR_MEDIA_ALWAYS;
-const VMD_HINTS_FILE = process.env.VMD_HINTS_FILE;
-
-/* security, secrets */
-const LEGACY_CRYPTO = !!process.env.LEGACY_CRYPTO;
-const JWT_SECRET = process.env.JWT_SECRET;
-const ENCRYPTION_SECRET = process.env.ENCRYPTION_SECRET;
-
-/* HTTP/1 pool dispatcher */
-const HTTP_POOL = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);
-const HTTP_POOLSIZE = parseInt(process.env.HTTP_POOLSIZE, 10) || 10;
-const HTTP_PIPELINING = parseInt(process.env.HTTP_PIPELINING, 10) || 1;
-const HTTP_TIMEOUT = 10000;
-
-const OPTIONS_PING_INTERVAL = parseInt(process.env.OPTIONS_PING_INTERVAL, 10) || 30000;
-
-module.exports = {
-  JAMBONES_MYSQL_HOST,
-  JAMBONES_MYSQL_USER,
-  JAMBONES_MYSQL_PASSWORD,
-  JAMBONES_MYSQL_DATABASE,
-  JAMBONES_MYSQL_REFRESH_TTL,
-  JAMBONES_MYSQL_CONNECTION_LIMIT,
-  JAMBONES_MYSQL_PORT,
-
-  DRACHTIO_PORT,
-  DRACHTIO_HOST,
-  DRACHTIO_SECRET,
-
-  JAMBONES_GATHER_EARLY_HINTS_MATCH,
-  JAMBONZ_GATHER_EARLY_HINTS_MATCH,
-  JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS,
-  JAMBONES_FREESWITCH,
-  JAMBONES_REDIS_HOST,
-  JAMBONES_REDIS_PORT,
-  SMPP_URL,
-  JAMBONES_NETWORK_CIDR,
-  JAMBONES_API_BASE_URL,
-  JAMBONES_TIME_SERIES_HOST,
-  JAMBONES_INJECT_CONTENT,
-  JAMBONES_ESL_LISTEN_ADDRESS,
-  JAMBONES_SBCS,
-  JAMBONES_OTEL_ENABLED,
-  JAMBONES_OTEL_SERVICE_NAME,
-  OTEL_EXPORTER_JAEGER_AGENT_HOST,
-  OTEL_EXPORTER_JAEGER_ENDPOINT,
-  OTEL_EXPORTER_ZIPKIN_URL,
-  OTEL_EXPORTER_COLLECTOR_URL,
-
-  JAMBONES_LOGLEVEL,
-  JAMBONES_CLUSTER_ID,
-  PORT,
-  HTTP_PORT_MAX,
-  K8S,
-  K8S_SBC_SIP_SERVICE_NAME,
-  JAMBONES_SUBNET,
-  NODE_ENV,
-  JAMBONZ_CLEANUP_INTERVAL_MINS,
-  getCleanupIntervalMins,
-  checkEnvs,
-
-  AWS_REGION,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  AWS_SNS_PORT,
-  AWS_SNS_TOPIC_ARM,
-  AWS_SNS_PORT_MAX,
-
-  ANCHOR_MEDIA_ALWAYS,
-  VMD_HINTS_FILE,
-  JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS,
-
-  LEGACY_CRYPTO,
-  JWT_SECRET,
-  ENCRYPTION_SECRET,
-  HTTP_POOL,
-  HTTP_POOLSIZE,
-  HTTP_PIPELINING,
-  HTTP_TIMEOUT,
-  OPTIONS_PING_INTERVAL,
-  RESPONSE_TIMEOUT_MS,
-  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
-  JAMBONES_WS_MAX_PAYLOAD,
-  MAX_RECONNECTS,
-  GCP_JSON_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY
-};
--- a/lib/http-routes/api/create-call.js
+++ b/lib/http-routes/api/create-call.js
@@ -27,7 +27,6 @@ router.post('/', async(req, res) => {
    const target = restDial.to;
    const opts = {
      callingNumber: restDial.from,
-      ...(restDial.callerName && {callingName: restDial.callerName}),
      headers: req.body.headers || {}
    };

@@ -86,20 +85,6 @@ router.post('/', async(req, res) => {
      }
    }

-    /**
-     * trunk isn't specified,
-     * check if from-number matches any existing numbers on Jambonz
-     *  */
-    if (target.type === 'phone' && !target.trunk) {
-      const {lookupCarrierByPhoneNumber} = dbUtils(this.logger, srf);
-      const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, restDial.from);
-      logger.info(
-        `createCall: selected ${voip_carrier_sid} for requested phone number: ${restDial.from || 'unspecified'})`);
-      if (voip_carrier_sid) {
-        opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-      }
-    }
-
    /* create endpoint for outdial */
    const ms = getFreeswitch();
    if (!ms) throw new Error('no available Freeswitch for outbound call creation');
@@ -119,7 +104,7 @@ router.post('/', async(req, res) => {
      proxy: `sip:${sbcAddress}`,
      localSdp: ep.local.sdp
    });
-    if (target.auth) opts.auth = target.auth;
+    if (target.auth) opts.auth = this.target.auth;


    /**
--- a/lib/middleware.js
+++ b/lib/middleware.js
@@ -10,9 +10,6 @@ const { normalizeJambones }  = require('@jambonz/verb-specifications');
 const dbUtils = require('./utils/db-utils');
 const RootSpan = require('./utils/call-tracer');
 const listTaskNames = require('./utils/summarize-tasks');
-const {
-  JAMBONES_MYSQL_REFRESH_TTL,
-} = require('./config');

 module.exports = function(srf, logger) {
  const {
@@ -30,11 +27,7 @@ module.exports = function(srf, logger) {

  function initLocals(req, res, next) {
    const callId = req.get('Call-ID');
-    logger.info({
-      callId,
-      callingNumber: req.callingNumber,
-      calledNumber: req.calledNumber
-    }, 'new incoming call');
+    logger.info({callId}, 'new incoming call');
    if (!req.has('X-Account-Sid')) {
      logger.info('getAccountDetails - rejecting call due to missing X-Account-Sid header');
      return res.send(500);
@@ -49,16 +42,7 @@ module.exports = function(srf, logger) {
    }
    if (req.has('X-Authenticated-User')) req.locals.originatingUser = req.get('X-Authenticated-User');
    if (req.has('X-MS-Teams-Tenant-FQDN')) req.locals.msTeamsTenant = req.get('X-MS-Teams-Tenant-FQDN');
-    if (req.has('X-Cisco-Recording-Participant')) {
-      const ciscoParticipants = req.get('X-Cisco-Recording-Participant');
-      const regex = /sip:[\d]+@[\d]+\.[\d]+\.[\d]+\.[\d]+/g;
-      const sipURIs = ciscoParticipants.match(regex);
-      logger.info(`X-Cisco-Recording-Participant : ${sipURIs} `);
-      if (sipURIs && sipURIs.length > 0) {
-        req.locals.calledNumber = sipURIs[0];
-        req.locals.callingNumber = sipURIs[1];
-      }
-    }
+
    next();
  }

@@ -106,10 +90,8 @@ module.exports = function(srf, logger) {
          .find((p) => p.type === 'application/sdp')
          .content;
        const {sdp1, sdp2, ...metadata} = await parseSiprecPayload(req, logger);
-        if (!req.locals.calledNumber && !req.locals.calledNumber) {
-          req.locals.calledNumber = metadata.caller.number;
-          req.locals.callingNumber = metadata.callee.number;
-        }
+        req.locals.calledNumber = metadata.caller.number;
+        req.locals.callingNumber = metadata.callee.number;
        req.locals = {
          ...req.locals,
          siprec: {
@@ -245,12 +227,11 @@ module.exports = function(srf, logger) {
      */

      /* allow for caching data - when caching treat retrieved data as immutable */
-      const app2 = JAMBONES_MYSQL_REFRESH_TTL ? JSON.parse(JSON.stringify(app)) : app;
+      const app2 = process.env.JAMBONES_MYSQL_REFRESH_TTL ? JSON.parse(JSON.stringify(app)) : app;
      if ('WS' === app.call_hook?.method ||
        app.call_hook?.url.startsWith('ws://') || app.call_hook?.url.startsWith('wss://')) {
-        const requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
-        app2.requestor = requestor;
-        app2.notifier = requestor;
+        app2.requestor = new WsRequestor(logger, account_sid, app.call_hook, accountInfo.account.webhook_secret) ;
+        app2.notifier = app.requestor;
        app2.call_hook.method = 'WS';
      }
      else {
@@ -289,7 +270,7 @@ module.exports = function(srf, logger) {
    const {rootSpan, siprec, application:app} = req.locals;
    let span;
    try {
-      if (app.tasks && !JAMBONES_MYSQL_REFRESH_TTL) {
+      if (app.tasks && !process.env.JAMBONES_MYSQL_REFRESH_TTL) {
        app.tasks = normalizeJambones(logger, app.tasks).map((tdata) => makeTask(logger, tdata));
        if (0 === app.tasks.length) throw new Error('no application provided');
        return next();
--- a/lib/session/call-info.js
+++ b/lib/session/call-info.js
@@ -1,7 +1,6 @@
 const {CallDirection, CallStatus} = require('../utils/constants');
 const parseUri = require('drachtio-srf').parseUri;
 const uuidv4 = require('uuid-random');
-const {JAMBONES_API_BASE_URL} = require('../config');
 /**
 * @classdesc Represents the common information for all calls
 * that is provided in call status webhooks
@@ -34,23 +33,6 @@ class CallInfo {
      this.callStatus = CallStatus.Trying;
      this.originatingSipIp = req.get('X-Forwarded-For');
      this.originatingSipTrunkName = req.get('X-Originating-Carrier');
-      const {siprec} = req.locals;
-      if (siprec) {
-        const caller = parseUri(req.locals.callingNumber);
-        const callee = parseUri(req.locals.calledNumber);
-        this.participants = [
-          {
-            participant: 'caller',
-            uriUser: caller?.user,
-            uriHost: caller?.host
-          },
-          {
-            participant: 'callee',
-            uriUser: callee?.user,
-            uriHost: callee?.host
-          }
-        ];
-      }
    }
    else if (opts.parentCallInfo) {
      // outbound call that is a child of an existing call
@@ -147,8 +129,8 @@ class CallInfo {
      Object.assign(obj, {customerData: this._customerData});
    }

-    if (JAMBONES_API_BASE_URL) {
-      Object.assign(obj, {apiBaseUrl: JAMBONES_API_BASE_URL});
+    if (process.env.JAMBONES_API_BASE_URL) {
+      Object.assign(obj, {apiBaseUrl: process.env.JAMBONES_API_BASE_URL});
    }
    if (this.publicIp) {
      Object.assign(obj, {fsPublicIp: this.publicIp});
--- a/lib/session/call-session.js
+++ b/lib/session/call-session.js
@@ -17,10 +17,6 @@ const { normalizeJambones } = require('@jambonz/verb-specifications');
 const listTaskNames = require('../utils/summarize-tasks');
 const HttpRequestor = require('../utils/http-requestor');
 const WsRequestor = require('../utils/ws-requestor');
-const {
-  JAMBONES_INJECT_CONTENT,
-  AWS_REGION
-} = require('../config');
 const BADPRECONDITIONS = 'preconditions not met';
 const CALLER_CANCELLED_ERR_MSG = 'Response not sent due to unknown transaction';

@@ -64,16 +60,6 @@ class CallSession extends Emitter {
    this.notifiedComplete = false;
    this.rootSpan = rootSpan;

-    this._origRecognizerSettings = {
-      vendor: this.application?.speech_recognizer_vendor,
-      language: this.application?.speech_recognizer_language,
-    };
-    this._origSynthesizerSettings = {
-      vendor: this.application?.speech_synthesis_vendor,
-      language: this.application?.speech_synthesis_language,
-      voice: this.application?.speech_synthesis_voice,
-    };
-
    assert(rootSpan);

    this._recordState = RecordState.RecordingOff;
@@ -334,22 +320,6 @@ class CallSession extends Emitter {
    return this._globalSttPunctuation !== undefined;
  }

-  resetRecognizer() {
-    this._globalSttHints = undefined;
-    this._globalSttPunctuation = undefined;
-    this._globalAltLanguages = undefined;
-    this.isContinuousAsr = false;
-    this.asrDtmfTerminationDigits = undefined;
-    this.speechRecognizerLanguage = this._origRecognizerSettings.language;
-    this.speechRecognizerVendor = this._origRecognizerSettings.vendor;
-  }
-
-  resetSynthesizer() {
-    this.speechSynthesisLanguage = this._origSynthesizerSettings.language;
-    this.speechSynthesisVendor = this._origSynthesizerSettings.vendor;
-    this.speechSynthesisVoice = this._origSynthesizerSettings.voice;
-  }
-
  async notifyRecordOptions(opts) {
    const {action} = opts;
    this.logger.debug({opts}, 'CallSession:notifyRecordOptions');
@@ -541,24 +511,12 @@ class CallSession extends Emitter {

  async enableBotMode(gather, autoEnable) {
    try {
-      const t = normalizeJambones(this.logger, [gather]);
-      const task = makeTask(this.logger, t[0]);
-
-      if (this.isBotModeEnabled) {
-        const currInput = this.backgroundGatherTask.input;
-        const newInput = task.input;
-        if (JSON.stringify(currInput) === JSON.stringify(newInput)) {
-          this.logger.info('CallSession:enableBotMode - bot mode currently enabled, ignoring request to start again');
-          return;
-        }
-        else {
-          this.logger.info({currInput, newInput},
-            'CallSession:enableBotMode - restarting background gather to apply new input type');
-          this.backgroundGatherTask.sticky = false;
-          await this.disableBotMode();
-        }
+      if (this.backgroundGatherTask) {
+        this.logger.info('CallSession:enableBotMode - bot mode currently enabled, ignoring request to start again');
+        return;
      }
-      this.backgroundGatherTask = task;
+      const t = normalizeJambones(this.logger, [gather]);
+      this.backgroundGatherTask = makeTask(this.logger, t[0]);
      this._bargeInEnabled = true;
      this.backgroundGatherTask
        .once('dtmf', this._clearTasks.bind(this, this.backgroundGatherTask))
@@ -570,15 +528,13 @@ class CallSession extends Emitter {
      const {span, ctx} = this.rootSpan.startChildSpan(`background-gather:${this.backgroundGatherTask.summary}`);
      this.backgroundGatherTask.span = span;
      this.backgroundGatherTask.ctx = ctx;
-      this.backgroundGatherTask.sticky = autoEnable;
      this.backgroundGatherTask.exec(this, resources)
        .then(() => {
          this.logger.info('CallSession:enableBotMode: gather completed');
          this.backgroundGatherTask && this.backgroundGatherTask.removeAllListeners();
          this.backgroundGatherTask && this.backgroundGatherTask.span.end();
-          const sticky = this.backgroundGatherTask?.sticky;
          this.backgroundGatherTask = null;
-          if (sticky && !this.callGone && !this._stopping && this._bargeInEnabled) {
+          if (autoEnable && !this.callGone && !this._stopping && this._bargeInEnabled) {
            this.logger.info('CallSession:enableBotMode: restarting background gather');
            setImmediate(() => this.enableBotMode(gather, true));
          }
@@ -594,12 +550,12 @@ class CallSession extends Emitter {
      this.logger.info({err, gather}, 'CallSession:enableBotMode - Error creating gather task');
    }
  }
-  async disableBotMode() {
+  disableBotMode() {
    this._bargeInEnabled = false;
    if (this.backgroundGatherTask) {
      try {
        this.backgroundGatherTask.removeAllListeners();
-        await this.backgroundGatherTask.kill();
+        this.backgroundGatherTask.kill().catch((err) => {});
      } catch (err) {}
      this.backgroundGatherTask = null;
    }
@@ -656,7 +612,7 @@ class CallSession extends Emitter {
            speech_credential_sid: credential.speech_credential_sid,
            accessKeyId: credential.access_key_id,
            secretAccessKey: credential.secret_access_key,
-            region: credential.aws_region || AWS_REGION
+            region: credential.aws_region || process.env.AWS_REGION
          };
        }
        else if ('microsoft' === vendor) {
@@ -680,9 +636,7 @@ class CallSession extends Emitter {
          return {
            speech_credential_sid: credential.speech_credential_sid,
            client_id: credential.client_id,
-            secret: credential.secret,
-            nuance_tts_uri: credential.nuance_tts_uri,
-            nuance_stt_uri: credential.nuance_stt_uri
+            secret: credential.secret
          };
        }
        else if ('deepgram' === vendor) {
@@ -706,20 +660,6 @@ class CallSession extends Emitter {
            stt_region: credential.stt_region
          };
        }
-        else if ('nvidia' === vendor) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            riva_server_uri: credential.riva_server_uri
-          };
-        }
-        else if (vendor.startsWith('custom:')) {
-          return {
-            speech_credential_sid: credential.speech_credential_sid,
-            auth_token: credential.auth_token,
-            custom_stt_url: credential.custom_stt_url,
-            custom_tts_url: credential.custom_tts_url
-          };
-        }
      }
      else {
        writeAlerts({
@@ -750,18 +690,17 @@ class CallSession extends Emitter {
        let skip = false;
        this.currentTask = task;
        if (TaskName.Gather === task.name && this.isBotModeEnabled) {
-          if (this.backgroundGatherTask.updateTaskInProgress(task) !== false) {
+          if (this.backgroundGatherTask.updateTaskInProgress(task)) {
            this.logger.info(`CallSession:exec skipping #${stackNum}:${taskNum}: ${task.name}`);
            skip = true;
          }
          else {
            this.logger.info('CallSession:exec disabling bot mode to start gather with new options');
-            await this.disableBotMode();
+            this.disableBotMode();
          }
        }
        if (!skip) {
          const {span, ctx} = this.rootSpan.startChildSpan(`verb:${task.summary}`);
-          span.setAttributes({'verb.summary': task.summary});
          task.span = span;
          task.ctx = ctx;
          await task.exec(this, resources);
@@ -783,22 +722,19 @@ class CallSession extends Emitter {
      }

      if (0 === this.tasks.length && this.requestor instanceof WsRequestor && !this.callGone) {
-        //let span;
+        let span;
        try {
-          //const {span} = this.rootSpan.startChildSpan('waiting for commands');
-          //const {reason, queue, command} = await this._awaitCommandsOrHangup();
-          /*
+          const {span} = this.rootSpan.startChildSpan('waiting for commands');
+          const {reason, queue, command} = await this._awaitCommandsOrHangup();
          span.setAttributes({
            'completion.reason': reason,
            'async.request.queue': queue,
            'async.request.command': command
          });
          span.end();
-          */
-          await this._awaitCommandsOrHangup();
          if (this.callGone) break;
        } catch (err) {
-          //span.end();
+          span.end();
          this.logger.info(err, 'CallSession:exec - error waiting for new commands');
          break;
        }
@@ -818,6 +754,7 @@ class CallSession extends Emitter {

  trackTmpFile(path) {
    // TODO: don't add if its already in the list (should we make it a set?)
+    this.logger.debug(`adding tmp file to track ${path}`);
    this.tmpFiles.add(path);
  }

@@ -1192,14 +1129,14 @@ class CallSession extends Emitter {
  _injectTasks(newTasks) {
    const gatherPos = this.tasks.map((t) => t.name).indexOf(TaskName.Gather);
    const currentlyExecutingGather = this.currentTask?.name === TaskName.Gather;
-    /*
+
    this.logger.debug({
      currentTaskList: listTaskNames(this.tasks),
      newContent: listTaskNames(newTasks),
      currentlyExecutingGather,
      gatherPos
    }, 'CallSession:_injectTasks - starting');
-    */
+
    const killGather = () => {
      this.logger.debug('CallSession:_injectTasks - killing current gather because we have new content');
      this.currentTask.kill(this);
@@ -1208,11 +1145,10 @@ class CallSession extends Emitter {
    if (-1 === gatherPos) {
      /* no gather in the stack  simply append tasks */
      this.tasks.push(...newTasks);
-      /*
      this.logger.debug({
        updatedTaskList: listTaskNames(this.tasks)
      }, 'CallSession:_injectTasks - completed (simple append)');
-      */
+
      /* we do need to kill the current gather if we are executing one */
      if (currentlyExecutingGather) killGather();
      return;
@@ -1228,7 +1164,7 @@ class CallSession extends Emitter {
  }

  _onCommand({msgid, command, call_sid, queueCommand, data}) {
-    this.logger.info({msgid, command, queueCommand, data}, 'CallSession:_onCommand - received command');
+    this.logger.info({msgid, command, queueCommand}, 'CallSession:_onCommand - received command');
    const resolution = {reason: 'received command', queue: queueCommand, command};
    switch (command) {
      case 'redirect':
@@ -1239,11 +1175,13 @@ class CallSession extends Emitter {
            this.logger.info({tasks: listTaskNames(t)}, 'CallSession:_onCommand new task list');
            this.replaceApplication(t);
          }
-          else if (JAMBONES_INJECT_CONTENT) {
+          else if (process.env.JAMBONES_INJECT_CONTENT) {
+            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks (injecting content)');
            this._injectTasks(t);
            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
          }
          else {
+            this.logger.debug({tasks: listTaskNames(t)}, 'CallSession:_onCommand - queueing tasks');
            this.tasks.push(...t);
            this.logger.info({tasks: listTaskNames(this.tasks)}, 'CallSession:_onCommand - updated task list');
          }
@@ -1287,21 +1225,19 @@ class CallSession extends Emitter {
        this.logger.info(`CallSession:_onCommand - invalid command ${command}`);
    }
    if (this.wakeupResolver) {
-      //this.logger.debug({resolution}, 'CallSession:_onCommand - got commands, waking up..');
+      this.logger.debug({resolution}, 'CallSession:_onCommand - got commands, waking up..');
      this.wakeupResolver(resolution);
      this.wakeupResolver = null;
    }
-    /*
    else {
+      const {span} = this.rootSpan.startChildSpan('async command');
      const {queue, command} = resolution;
-      const {span} = this.rootSpan.startChildSpan(`recv cmd: ${command}`);
      span.setAttributes({
        'async.request.queue': queue,
        'async.request.command': command
      });
      span.end();
    }
-    */
  }

  _onWsConnectionDropped() {
@@ -1587,7 +1523,7 @@ class CallSession extends Emitter {
      const pp = this._pool.promise();
      try {
        this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: looking up account');
-        const [r] = await pp.query(sqlRetrieveQueueEventHook, [this.accountSid]);
+        const [r] = await pp.query(sqlRetrieveQueueEventHook, this.accountSid);
        if (0 === r.length) {
          this.logger.info({accountSid: this.accountSid}, 'performQueueWebhook: no webhook provisioned');
          this.queueEventHookRequestor = null;
--- a/lib/session/rest-call-session.js
+++ b/lib/session/rest-call-session.js
@@ -21,10 +21,6 @@ class RestCallSession extends CallSession {
    });
    this.req = req;
    this.ep = ep;
-    // keep restDialTask reference for closing AMD
-    if (tasks.length) {
-      this.restDialTask = tasks[0];
-    }

    this.on('callStatusChange', this._notifyCallStatusChange.bind(this));
    this._notifyCallStatusChange({
@@ -48,10 +44,6 @@ class RestCallSession extends CallSession {
   * This is invoked when the called party hangs up, in order to calculate the call duration.
   */
  _callerHungup() {
-    if (this.restDialTask) {
-      this.logger.info('RestCallSession: releasing AMD');
-      this.restDialTask.turnOffAmd();
-    }
    this.callInfo.callTerminationBy = 'caller';
    const duration = moment().diff(this.dlg.connectTime, 'seconds');
    this.emit('callStatusChange', {callStatus: CallStatus.Completed, duration});
--- a/lib/session/siprec-call-session.js
+++ b/lib/session/siprec-call-session.js
@@ -1,7 +1,6 @@
 const InboundCallSession = require('./inbound-call-session');
 const {createSipRecPayload} = require('../utils/siprec-utils');
 const {CallStatus} = require('../utils/constants');
-const {parseSiprecPayload} = require('../utils/siprec-utils');
 /**
 * @classdesc Subclass of InboundCallSession.  This represents a CallSession that is
 * established for an inbound SIPREC call.
@@ -17,32 +16,6 @@ class SipRecCallSession extends InboundCallSession {
    this.metadata = metadata;
  }

-  async _onReinvite(req, res) {
-    try {
-      this.logger.info(req.payload, 'SipRec Re-INVITE payload');
-      const {sdp1: reSdp1, sdp2: reSdp2, metadata: reMetadata} = await parseSiprecPayload(req, this.logger);
-      this.sdp1 = reSdp1;
-      this.sdp2 = reSdp2;
-      this.metadata = reMetadata;
-
-      if (this.ep && this.ep2) {
-        let remoteSdp = this.sdp1.replace(/sendonly/, 'sendrecv');
-        const newSdp1 = await this.ep.modify(remoteSdp);
-        remoteSdp = this.sdp2.replace(/sendonly/, 'sendrecv');
-        const newSdp2 = await this.ep2.modify(remoteSdp);
-        const combinedSdp = await createSipRecPayload(newSdp1, newSdp2, this.logger);
-        res.send(200, {body: combinedSdp});
-        this.logger.info({offer: req.body, answer: combinedSdp}, 'SipRec handling reINVITE');
-      }
-      else {
-        this.logger.info('got SipRec reINVITE but no endpoint and media has not been released');
-        res.send(488);
-      }
-    } catch (err) {
-      this.logger.error(err, 'Error handling reinvite');
-    }
-  }
-
  async answerSipRecCall() {
    try {
      this.ms = this.getMS();
--- a/lib/tasks/config.js
+++ b/lib/tasks/config.js
@@ -30,12 +30,6 @@ class TaskConfig extends Task {
        if (this.bargeIn[k]) this.gatherOpts[k] = this.bargeIn[k];
      });
    }
-
-    if (this.data.reset) {
-      if (typeof this.data.reset === 'string') this.data.reset = [this.data.reset];
-    }
-    else this.data.reset = [];
-
    if (this.bargeIn.sticky) this.autoEnable = true;
    this.preconditions = (this.bargeIn.enable || this.record?.action || this.listen?.url || this.data.amd) ?
      TaskPreconditions.Endpoint :
@@ -51,10 +45,6 @@ class TaskConfig extends Task {

  get summary() {
    const phrase = [];
-
-    /* reset recognizer and/or synthesizer to default values? */
-    if (this.data.reset.length) phrase.push(`reset ${this.data.reset.join(',')}`);
-
    if (this.bargeIn.enable) phrase.push('enable barge-in');
    if (this.hasSynthesizer) {
      const {vendor:v, language:l, voice} = this.synthesizer;
@@ -72,7 +62,7 @@ class TaskConfig extends Task {
    }
    if (this.data.amd) phrase.push('enable amd');
    if (this.notifyEvents) phrase.push(`event notification ${this.notifyEvents ? 'on' : 'off'}`);
-    return `${this.name}{${phrase.join(',')}}`;
+    return `${this.name}{${phrase.join(',')}`;
  }

  async exec(cs, {ep} = {}) {
@@ -96,11 +86,6 @@ class TaskConfig extends Task {
      }
    }

-    this.data.reset.forEach((k) => {
-      if (k === 'synthesizer') cs.resetSynthesizer();
-      else if (k === 'recognizer') cs.resetRecognizer();
-    });
-
    if (this.hasSynthesizer) {
      cs.speechSynthesisVendor = this.synthesizer.vendor !== 'default'
        ? this.synthesizer.vendor
--- a/lib/tasks/dial.js
+++ b/lib/tasks/dial.js
@@ -15,7 +15,6 @@ const DtmfCollector = require('../utils/dtmf-collector');
 const dbUtils = require('../utils/db-utils');
 const debug = require('debug')('jambonz:feature-server');
 const {parseUri} = require('drachtio-srf');
-const {ANCHOR_MEDIA_ALWAYS} = require('../config');

 function parseDtmfOptions(logger, dtmfCapture) {
  let parentDtmfCollector, childDtmfCollector;
@@ -85,7 +84,6 @@ class TaskDial extends Task {

    this.earlyMedia = this.data.answerOnBridge === true;
    this.callerId = this.data.callerId;
-    this.callerName = this.data.callerName;
    this.dialMusic = this.data.dialMusic;
    this.headers = this.data.headers || {};
    this.method = this.data.method || 'POST';
@@ -136,13 +134,10 @@ class TaskDial extends Task {
  get name() { return TaskName.Dial; }

  get canReleaseMedia() {
-    const keepAnchor = this.data.anchorMedia ||
-    ANCHOR_MEDIA_ALWAYS ||
-    this.listenTask ||
-    this.transcribeTask ||
-    this.startAmd;
-
-    return !keepAnchor;
+    return !process.env.ANCHOR_MEDIA_ALWAYS &&
+      !this.listenTask &&
+      !this.transcribeTask &&
+      !this.startAmd;
  }

  get summary() {
@@ -399,25 +394,20 @@ class TaskDial extends Task {
    const {req, srf} = cs;
    const {getSBC} = srf.locals;
    const {lookupTeamsByAccount, lookupAccountBySid} = srf.locals.dbHelpers;
-    const {lookupCarrier, lookupCarrierByPhoneNumber} = dbUtils(this.logger, cs.srf);
+    const {lookupCarrier} = dbUtils(this.logger, cs.srf);
    const sbcAddress = this.proxy || getSBC();
    const teamsInfo = {};
    let fqdn;

    if (!sbcAddress) throw new Error('no SBC found for outbound call');
-    this.headers = {
-      'X-Account-Sid': cs.accountSid,
-      ...(req && req.has('X-CID') && {'X-CID': req.get('X-CID')}),
-      ...(req && req.has('P-Asserted-Identity') && {'P-Asserted-Identity': req.get('P-Asserted-Identity')}),
-      // Put headers at the end to make sure opt.headers override all default behavior.
-      ...this.headers
-    };
-
    const opts = {
-      headers: this.headers,
+      headers: req && req.has('X-CID') ? Object.assign(this.headers, {'X-CID': req.get('X-CID')}) : this.headers,
      proxy: `sip:${sbcAddress}`,
-      callingNumber: this.callerId || req.callingNumber,
-      ...(this.callerName && {callingName: this.callerName})
+      callingNumber: this.callerId || req.callingNumber
+    };
+    opts.headers = {
+      ...opts.headers,
+      'X-Account-Sid': cs.accountSid
    };

    const t = this.target.find((t) => t.type === 'teams');
@@ -465,19 +455,6 @@ class TaskDial extends Task {
          }
        }

-        /**
-         * trunk isn't specified,
-         * check if number matches any existing numbers
-         *  */
-        if (t.type === 'phone' && !t.trunk) {
-          const voip_carrier_sid = await lookupCarrierByPhoneNumber(req.body.account_sid, t.number);
-          this.logger.info(
-            `Dial:_attemptCalls: selected ${voip_carrier_sid} for requested phone number: ${t.number})`);
-          if (voip_carrier_sid) {
-            opts.headers['X-Requested-Carrier-Sid'] = voip_carrier_sid;
-          }
-        }
-
        if (this.killed) return;

        const sd = placeCall({
--- a/lib/tasks/gather.js
+++ b/lib/tasks/gather.js
@@ -9,14 +9,9 @@ const {
  DeepgramTranscriptionEvents,
  SonioxTranscriptionEvents,
  IbmTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
+  NvidiaTranscriptionEvents
 } = require('../utils/constants');
-const {
-  JAMBONES_GATHER_EARLY_HINTS_MATCH,
-  JAMBONZ_GATHER_EARLY_HINTS_MATCH,
-  JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS,
-} = require('../config');
+
 const makeTask = require('./make_task');
 const assert = require('assert');

@@ -58,7 +53,7 @@ class TaskGather extends Task {

    /* timeout of zero means no timeout */
    this.timeout = this.timeout === 0 ? 0 : (this.timeout || 15) * 1000;
-    this.interim = !!this.partialResultHook || this.bargein || (this.timeout > 0);
+    this.interim = !!this.partialResultHook || this.bargein;
    this.listenDuringPrompt = this.data.listenDuringPrompt === false ? false : true;
    this.minBargeinWordCount = this.data.minBargeinWordCount || 1;
    if (this.data.recognizer) {
@@ -74,11 +69,6 @@ class TaskGather extends Task {
      if (this.asrTimeout > 0) this.asrDtmfTerminationDigit = recognizer.asrDtmfTerminationDigit;
      this.isContinuousAsr = this.asrTimeout > 0;

-      if (Array.isArray(this.data.recognizer.hints) &&
-        0 == this.data.recognizer.hints.length && JAMBONES_GATHER_CLEAR_GLOBAL_HINTS_ON_EMPTY_HINTS) {
-        logger.debug('Gather: an empty hints array was supplied, so we will mask global hints');
-        this.maskGlobalSttHints = true;
-      }
      this.data.recognizer.hints = this.data.recognizer.hints || [];
      this.data.recognizer.altLanguages = this.data.recognizer.altLanguages || [];
    }
@@ -102,17 +92,12 @@ class TaskGather extends Task {
    this._sonioxTranscripts = [];

    this.parentTask = parentTask;
-    this.partialTranscriptsCount = 0;
  }

  get name() { return TaskName.Gather; }

  get needsStt() { return this.input.includes('speech'); }

-  get wantsSingleUtterance() {
-    return this.data.recognizer?.singleUtterance === true;
-  }
-
  get earlyMedia() {
    return (this.sayTask && this.sayTask.earlyMedia) ||
      (this.playTask && this.playTask.earlyMedia);
@@ -134,17 +119,14 @@ class TaskGather extends Task {
  }

  async exec(cs, {ep}) {
-    this.logger.debug({options: this.data}, 'Gather:exec');
+    this.logger.debug('Gather:exec');
    await super.exec(cs);
    const {updateSpeechCredentialLastUsed} = require('../utils/db-utils')(this.logger, cs.srf);
    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;

-    if (cs.hasGlobalSttHints && !this.maskGlobalSttHints) {
+    if (cs.hasGlobalSttHints) {
      const {hints, hintsBoost} = cs.globalSttHints;
-      const setOfHints = new Set(this.data.recognizer.hints
-        .concat(hints)
-        .filter((h) => typeof h === 'string' && h.length > 0));
-      this.data.recognizer.hints = [...setOfHints];
+      this.data.recognizer.hints = this.data.recognizer.hints.concat(hints);
      if (!this.data.recognizer.hintsBoost && hintsBoost) this.data.recognizer.hintsBoost = hintsBoost;
      this.logger.debug({hints: this.data.recognizer.hints, hintsBoost: this.data.recognizer.hintsBoost},
        'Gather:exec - applying global sttHints');
@@ -166,7 +148,7 @@ class TaskGather extends Task {
        asrDtmfTerminationDigit: this.asrDtmfTerminationDigit
      }, 'Gather:exec - enabling continuous ASR since it is turned on for the session');
    }
-
+    const {JAMBONZ_GATHER_EARLY_HINTS_MATCH, JAMBONES_GATHER_EARLY_HINTS_MATCH} = process.env;
    if ((JAMBONZ_GATHER_EARLY_HINTS_MATCH || JAMBONES_GATHER_EARLY_HINTS_MATCH) && this.needsStt &&
      !this.isContinuousAsr &&
      this.data.recognizer?.hints?.length > 0 && this.data.recognizer?.hints?.length <= 10) {
@@ -205,6 +187,7 @@ class TaskGather extends Task {
      throw new Error(`No speech-to-text service credentials for ${this.vendor} have been configured`);
    }

+    this.logger.info({sttCredentials: this.sttCredentials}, 'Gather:exec - sttCredentials');
    if (this.vendor === 'nuance' && this.sttCredentials.client_id) {
      /* get nuance access token */
      const {client_id, secret} = this.sttCredentials;
@@ -223,6 +206,7 @@ class TaskGather extends Task {
      this._startTimer();
      if (this.isContinuousAsr && 0 === this.timeout) this._startAsrTimer();
      if (this.input.includes('speech') && !this.listenDuringPrompt) {
+        this.logger.debug('Gather:exec - calling _initSpeech');
        this._initSpeech(cs, ep)
          .then(() => {
            if (this.killed) {
@@ -324,7 +308,6 @@ class TaskGather extends Task {
    const {timeout} = opts;
    this.timeout = timeout;
    this._startTimer();
-    return true;
  }

  _onDtmf(cs, ep, evt) {
@@ -364,6 +347,7 @@ class TaskGather extends Task {

  async _initSpeech(cs, ep) {
    const opts = this.setChannelVarsForStt(this, this.sttCredentials, this.data.recognizer);
+    this.logger.debug(opts, 'TaskGather:_initSpeech - channel vars');
    switch (this.vendor) {
      case 'google':
        this.bugname = 'google_transcribe';
@@ -395,6 +379,8 @@ class TaskGather extends Task {
          this._onTranscriptionComplete.bind(this, cs, ep));
        ep.addCustomEventListener(NuanceTranscriptionEvents.VadDetected,
          this._onVadDetected.bind(this, cs, ep));
+        ep.addCustomEventListener(NuanceTranscriptionEvents.Error,
+          this._onNuanceError.bind(this, cs, ep));

        /* stall timers until prompt finishes playing */
        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
@@ -413,6 +399,8 @@ class TaskGather extends Task {
      case 'soniox':
        this.bugname = 'soniox_transcribe';
        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+        ep.addCustomEventListener(SonioxTranscriptionEvents.Error,
+          this._onSonioxError.bind(this, cs, ep));
        break;

      case 'ibm':
@@ -421,6 +409,8 @@ class TaskGather extends Task {
        ep.addCustomEventListener(IbmTranscriptionEvents.Connect, this._onIbmConnect.bind(this, cs, ep));
        ep.addCustomEventListener(IbmTranscriptionEvents.ConnectFailure,
          this._onIbmConnectFailure.bind(this, cs, ep));
+        ep.addCustomEventListener(IbmTranscriptionEvents.Error,
+          this._onIbmError.bind(this, cs, ep));
        break;

      case 'nvidia':
@@ -433,6 +423,8 @@ class TaskGather extends Task {
          this._onTranscriptionComplete.bind(this, cs, ep));
        ep.addCustomEventListener(NvidiaTranscriptionEvents.VadDetected,
          this._onVadDetected.bind(this, cs, ep));
+        ep.addCustomEventListener(NvidiaTranscriptionEvents.Error,
+          this._onNvidiaError.bind(this, cs, ep));

        /* I think nvidia has this (??) - stall timers until prompt finishes playing */
        if ((this.sayTask || this.playTask) && this.listenDuringPrompt) {
@@ -441,23 +433,11 @@ class TaskGather extends Task {
        break;

      default:
-        if (this.vendor.startsWith('custom:')) {
-          this.bugname = `${this.vendor}_transcribe`;
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Connect, this._onJambonzConnect.bind(this, cs, ep));
-          ep.addCustomEventListener(JambonzTranscriptionEvents.ConnectFailure,
-            this._onJambonzConnectFailure.bind(this, cs, ep));
-          break;
-        }
-        else {
-          this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
-          this.notifyTaskDone();
-          throw new Error(`Invalid vendor ${this.vendor}`);
-        }
+        this.notifyError({ msg: 'ASR error', details:`Invalid vendor ${this.vendor}`});
+        this.notifyTaskDone();
+        throw new Error(`Invalid vendor ${this.vendor}`);
    }

-    /* common handler for all stt engine errors */
-    ep.addCustomEventListener(JambonzTranscriptionEvents.Error, this._onJambonzError.bind(this, cs, ep));
    await ep.set(opts)
      .catch((err) => this.logger.info(err, 'Error setting channel variables'));
  }
@@ -565,13 +545,8 @@ class TaskGather extends Task {
    }

    evt = this.normalizeTranscription(evt, this.vendor, 1, this.language);
-    if (evt.alternatives.length === 0) {
-      this.logger.info({evt}, 'TaskGather:_onTranscription - got empty transcript, continue listening');
-      return;
-    }

-    /* fast path: our first partial transcript exactly matches an early hint */
-    if (this.earlyHintsMatch && evt.is_final === false && this.partialTranscriptsCount++ === 0) {
+    if (this.earlyHintsMatch && evt.is_final === false) {
      const transcript = evt.alternatives[0].transcript?.toLowerCase();
      const hints = this.data.recognizer?.hints || [];
      if (hints.find((h) => h.toLowerCase() === transcript)) {
@@ -645,8 +620,6 @@ class TaskGather extends Task {
        others do not.
      */
      //const isStableEnough = typeof evt.stability === 'undefined' || evt.stability > GATHER_STABILITY_THRESHOLD;
-      this._clearTimer();
-      this._startTimer();
      if (this.bargein && (words + bufferedWords) >= this.minBargeinWordCount) {
        if (!this.playComplete) {
          this.logger.debug({transcript: evt.alternatives[0].transcript}, 'killing audio due to speech');
@@ -675,16 +648,7 @@ class TaskGather extends Task {
      this._killAudio(cs);
    }

-    /**
-     * By default, Gather asks google for multiple utterances.
-     * The reason is that we can sometimes get an 'end_of_utterance' event without
-     * getting a transcription.  This can happen if someone coughs or mumbles.
-     * For that reason don't ask for a single utterance and we'll terminate the transcribe operation
-     * once we get a final transcript.
-     * However, if the usr has specified a singleUtterance, then we need to restart here
-     * since we dont have a final transcript yet.
-     */
-    if (!this.resolved && !this.killed && !this._bufferedTranscripts.length && this.wantsSingleUtterance) {
+    if (!this.resolved && !this.killed && !this._bufferedTranscripts.length) {
      this._startTranscribing(ep);
    }
  }
@@ -698,30 +662,26 @@ class TaskGather extends Task {
  _onTranscriptionComplete(cs, ep) {
    this.logger.debug('TaskGather:_onTranscriptionComplete');
  }
+  _onNuanceError(cs, ep, evt) {
+    const {code, error, details} = evt;
+    if (code === 404 && error === 'No speech') {
+      this.logger.debug({code, error, details}, 'TaskGather:_onNuanceError');
+      return this._resolve('timeout');
+    }
+    this.logger.info({code, error, details}, 'TaskGather:_onNuanceError');
+    if (code === 413 && error === 'Too much speech') {
+      return this._resolve('timeout');
+    }
+  }
+  _onSonioxError(cs, ep, evt) {
+    this.logger.info({evt}, 'TaskGather:_onSonioxError');
+  }
+  _onNvidiaError(cs, ep, evt) {
+    this.logger.info({evt}, 'TaskGather:_onNvidiaError');
+  }
  _onDeepgramConnect(_cs, _ep) {
    this.logger.debug('TaskGather:_onDeepgramConnect');
  }
-  _onJambonzConnect(_cs, _ep) {
-    this.logger.debug('TaskGather:_onJambonzConnect');
-  }
-  _onJambonzError(cs, _ep, evt) {
-    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    const {writeAlerts, AlertType} = cs.srf.locals;
-
-    if (this.vendor === 'nuance') {
-      const {code, error} = evt;
-      if (code === 404 && error === 'No speech') return this._resolve('timeout');
-      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
-    }
-    this.logger.info({evt}, 'TaskGather:_onJambonzError');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
-  }

  _onDeepGramConnectFailure(cs, _ep, evt) {
    const {reason} = evt;
@@ -736,19 +696,6 @@ class TaskGather extends Task {
    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor deepgram: ${reason}`});
    this.notifyTaskDone();
  }
-  _onJambonzConnectFailure(cs, _ep, evt) {
-    const {reason} = evt;
-    const {writeAlerts, AlertType} = cs.srf.locals;
-    this.logger.info({evt}, 'TaskGather:_onJambonzConnectFailure');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Failed connecting to ${this.vendor} speech recognizer: ${reason}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Failed connecting to speech vendor ${this.vendor}: ${reason}`});
-    this.notifyTaskDone();
-  }

  _onIbmConnect(_cs, _ep) {
    this.logger.debug('TaskGather:_onIbmConnect');
@@ -798,10 +745,6 @@ class TaskGather extends Task {
    if (this.resolved) return;

    this.resolved = true;
-    // Clear dtmf event
-    if (this.dtmfBargein) {
-      this.ep.removeAllListeners('dtmf');
-    }
    clearTimeout(this.interDigitTimer);
    this._clearTimer();

--- a/lib/tasks/listen.js
+++ b/lib/tasks/listen.js
@@ -2,7 +2,6 @@ const Task = require('./task');
 const {TaskName, TaskPreconditions, ListenEvents, ListenStatus} = require('../utils/constants');
 const makeTask = require('./make_task');
 const moment = require('moment');
-const MAX_PLAY_AUDIO_QUEUE_SIZE = 10;

 class TaskListen extends Task {
  constructor(logger, opts, parentTask) {
@@ -21,8 +20,6 @@ class TaskListen extends Task {
    this.nested = parentTask instanceof Task;

    this.results = {};
-    this.playAudioQueue = [];
-    this.isPlayingAudioFromQueue = false;

    if (this.transcribe) this.transcribeTask = makeTask(logger, {'transcribe': opts.transcribe}, this);
  }
@@ -61,7 +58,6 @@ class TaskListen extends Task {
    super.kill(cs);
    this.logger.debug(`TaskListen:kill endpoint connected? ${this.ep && this.ep.connected}`);
    this._clearTimer();
-    this.playAudioQueue = [];
    if (this.ep && this.ep.connected) {
      this.logger.debug('TaskListen:kill closing websocket');
      try {
@@ -188,36 +184,16 @@ class TaskListen extends Task {
    this.notifyTaskDone();
  }

-  async _playAudio(ep, evt, logger) {
-    try {
-      const results = await ep.play(evt.file);
-      logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
-      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
-    } catch (err) {
-      logger.error({err}, 'Error playing file');
-    }
-  }
-
  async _onPlayAudio(ep, evt) {
    this.logger.info(`received play_audio event: ${JSON.stringify(evt)}`);
-    if (!evt.queuePlay) {
-      this.playAudioQueue = [];
-      this._playAudio(ep, evt, this.logger);
-      this.isPlayingAudioFromQueue = false;
-      return;
+    try {
+      const results = await ep.play(evt.file);
+      this.logger.debug(`Finished playing file, result: ${JSON.stringify(results)}`);
+      ep.forkAudioSendText({type: 'playDone', data: Object.assign({id: evt.id}, results)});
    }
-
-    if (this.playAudioQueue.length <= MAX_PLAY_AUDIO_QUEUE_SIZE) {
-      this.playAudioQueue.push(evt);
+    catch (err) {
+      this.logger.error({err}, 'Error playing file');
    }
-
-    if (this.isPlayingAudioFromQueue) return;
-
-    this.isPlayingAudioFromQueue = true;
-    while (this.playAudioQueue.length > 0) {
-      await this._playAudio(ep, this.playAudioQueue.shift(), this.logger);
-    }
-    this.isPlayingAudioFromQueue = false;
  }

  _onKillAudio(ep) {
--- a/lib/tasks/message.js
+++ b/lib/tasks/message.js
@@ -2,7 +2,7 @@ const Task = require('./task');
 const {TaskName, TaskPreconditions} = require('../utils/constants');
 const bent = require('bent');
 const uuidv4 = require('uuid-random');
-const {K8S} = require('../config');
+
 class TaskMessage extends Task {
  constructor(logger, opts) {
    super(logger, opts);
@@ -42,7 +42,7 @@ class TaskMessage extends Task {
      }
      if (gw) {
        this.logger.info({gw, accountSid}, 'Message:exec - using smpp to send message');
-        url = K8S ? 'http://smpp' : getSmpp();
+        url = process.env.K8S ? 'http://smpp' : getSmpp();
        relativeUrl = '/sms';
        payload = {
          ...payload,
--- a/lib/tasks/rest_dial.js
+++ b/lib/tasks/rest_dial.js
@@ -11,7 +11,6 @@ class TaskRestDial extends Task {
    super(logger, opts);

    this.from = this.data.from;
-    this.callerName = this.data.callerName;
    this.fromHost = this.data.fromHost;
    this.to = this.data.to;
    this.call_hook = this.data.call_hook;
@@ -28,29 +27,18 @@ class TaskRestDial extends Task {
  */
  async exec(cs) {
    await super.exec(cs);
-    this.cs = cs;
    this.canCancel = true;

-    if (this.data.amd) {
-      this.startAmd = cs.startAmd;
-      this.stopAmd = cs.stopAmd;
-      this.on('amd', this._onAmdEvent.bind(this, cs));
-    }
-
    this._setCallTimer();
    await this.awaitTaskDone();
  }

-  turnOffAmd() {
-    if (this.callSession.ep && this.callSession.ep.amd) this.stopAmd(this.callSession.ep, this);
-  }
-
  kill(cs) {
    super.kill(cs);
    this._clearCallTimer();
-    if (this.canCancel) {
+    if (this.canCancel && cs?.req) {
      this.canCancel = false;
-      cs?.req?.cancel();
+      cs.req.cancel();
    }
    this.notifyTaskDone();
  }
@@ -77,13 +65,6 @@ class TaskRestDial extends Task {
          }
        }
      };
-      if (this.startAmd) {
-        try {
-          this.startAmd(this.callSession, this.callSession.ep, this, this.data.amd);
-        } catch (err) {
-          this.logger.info({err}, 'Rest:dial:Call established - Error calling startAmd');
-        }
-      }
      const tasks = await cs.requestor.request('session:new', this.call_hook, params, httpHeaders);
      if (tasks && Array.isArray(tasks)) {
        this.logger.debug({tasks: tasks}, `TaskRestDial: replacing application with ${tasks.length} tasks`);
@@ -116,16 +97,7 @@ class TaskRestDial extends Task {
  _onCallTimeout() {
    this.logger.debug('TaskRestDial: timeout expired without answer, killing task');
    this.timer = null;
-    this.kill(this.cs);
-  }
-
-  _onAmdEvent(cs, evt) {
-    this.logger.info({evt}, 'Rest:dial:_onAmdEvent');
-    const {actionHook} = this.data.amd;
-    this.performHook(cs, actionHook, evt)
-      .catch((err) => {
-        this.logger.error({err}, 'Rest:dial:_onAmdEvent - error calling actionHook');
-      });
+    this.kill();
  }
 }

--- a/lib/tasks/say.js
+++ b/lib/tasks/say.js
@@ -36,7 +36,6 @@ class TaskSay extends Task {
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
    this.synthesizer = this.data.synthesizer || {};
    this.disableTtsCache = this.data.disableTtsCache;
-    this.options = this.synthesizer.options || {};
  }

  get name() { return TaskName.Say; }
@@ -67,7 +66,7 @@ class TaskSay extends Task {
      cs.speechSynthesisVoice;
    const engine = this.synthesizer.engine || 'standard';
    const salt = cs.callSid;
-    let credentials = cs.getSpeechCredentials(vendor, 'tts');
+    const credentials = cs.getSpeechCredentials(vendor, 'tts');

    /* parse Nuance voices into name and model */
    let model;
@@ -79,16 +78,6 @@ class TaskSay extends Task {
      }
    }

-    /* allow for microsoft custom region voice and api_key to be specified as an override */
-    if (vendor === 'microsoft' && this.options.deploymentId) {
-      credentials = credentials || {};
-      credentials.use_custom_tts = true;
-      credentials.custom_tts_endpoint = this.options.deploymentId;
-      credentials.api_key = this.options.apiKey || credentials.apiKey;
-      credentials.region = this.options.region || credentials.region;
-      voice = this.options.voice || voice;
-    }
-
    this.logger.info({vendor, language, voice, model}, 'TaskSay:exec');
    this.ep = ep;
    try {
@@ -165,6 +154,7 @@ class TaskSay extends Task {

      const arr = this.text.map((t) => generateAudio(t));
      const filepath = (await Promise.all(arr)).filter((fp) => fp && fp.length);
+      this.logger.debug({filepath}, 'synthesized files for tts');
      this.notifyStatus({event: 'start-playback'});

      while (!this.killed && (this.loop === 'forever' || this.loop--) && this.ep?.connected) {
--- a/lib/tasks/task.js
+++ b/lib/tasks/task.js
@@ -155,7 +155,7 @@ class Task extends Emitter {
    if (this.actionHook) {
      const type = this.name === TaskName.Redirect ? 'session:redirect' : 'verb:hook';
      const params = results ? Object.assign(this.cs.callInfo.toJSON(), results) : this.cs.callInfo.toJSON();
-      const span = this.startSpan(`${type} (${this.actionHook})`);
+      const span = this.startSpan(type, {'hook.url': this.actionHook});
      const b3 = this.getTracingPropagation('b3', span);
      const httpHeaders = b3 && {b3};
      span.setAttributes({'http.body': JSON.stringify(params)});
--- a/lib/tasks/transcribe.js
+++ b/lib/tasks/transcribe.js
@@ -9,8 +9,7 @@ const {
  DeepgramTranscriptionEvents,
  SonioxTranscriptionEvents,
  IbmTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
+  NvidiaTranscriptionEvents
 } = require('../utils/constants');
 const { normalizeJambones } = require('@jambonz/verb-specifications');

@@ -24,13 +23,11 @@ class TaskTranscribe extends Task {
      setChannelVarsForStt,
      normalizeTranscription,
      removeSpeechListeners,
-      setSpeechCredentialsAtRuntime,
-      compileSonioxTranscripts
+      setSpeechCredentialsAtRuntime
    } = require('../utils/transcription-utils')(logger);
    this.setChannelVarsForStt = setChannelVarsForStt;
    this.normalizeTranscription = normalizeTranscription;
    this.removeSpeechListeners = removeSpeechListeners;
-    this.compileSonioxTranscripts = compileSonioxTranscripts;

    this.transcriptionHook = this.data.transcriptionHook;
    this.earlyMedia = this.data.earlyMedia === true || (parentTask && parentTask.earlyMedia);
@@ -44,9 +41,6 @@ class TaskTranscribe extends Task {
    /* let credentials be supplied in the recognizer object at runtime */
    this.sttCredentials = setSpeechCredentialsAtRuntime(recognizer);

-    /* buffer for soniox transcripts */
-    this._sonioxTranscripts = [];
-
    recognizer.hints = recognizer.hints || [];
    recognizer.altLanguages = recognizer.altLanguages || [];
  }
@@ -190,6 +184,8 @@ class TaskTranscribe extends Task {
          this._onStartOfSpeech.bind(this, cs, ep, channel));
        ep.addCustomEventListener(NuanceTranscriptionEvents.TranscriptionComplete,
          this._onTranscriptionComplete.bind(this, cs, ep, channel));
+        ep.addCustomEventListener(AzureTranscriptionEvents.Error,
+          this._onNuanceError.bind(this, cs, ep, channel));
        break;
      case 'deepgram':
        this.bugname = 'deepgram_transcribe';
@@ -202,8 +198,9 @@ class TaskTranscribe extends Task {
        break;
      case 'soniox':
        this.bugname = 'soniox_transcribe';
-        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription,
-          this._onTranscription.bind(this, cs, ep, channel));
+        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, this._onTranscription.bind(this, cs, ep));
+        ep.addCustomEventListener(SonioxTranscriptionEvents.Error,
+          this._onSonioxError.bind(this, cs, ep));
        break;
      case 'ibm':
        this.bugname = 'ibm_transcribe';
@@ -213,6 +210,8 @@ class TaskTranscribe extends Task {
          this._onIbmConnect.bind(this, cs, ep, channel));
        ep.addCustomEventListener(IbmTranscriptionEvents.ConnectFailure,
          this._onIbmConnectFailure.bind(this, cs, ep, channel));
+        ep.addCustomEventListener(IbmTranscriptionEvents.Error,
+          this._onIbmError.bind(this, cs, ep, channel));
        break;

      case 'nvidia':
@@ -225,13 +224,14 @@ class TaskTranscribe extends Task {
          this._onTranscriptionComplete.bind(this, cs, ep));
        ep.addCustomEventListener(NvidiaTranscriptionEvents.VadDetected,
          this._onVadDetected.bind(this, cs, ep));
+        ep.addCustomEventListener(NvidiaTranscriptionEvents.Error,
+          this._onNvidiaError.bind(this, cs, ep));
        break;
+
      default:
        throw new Error(`Invalid vendor ${this.vendor}`);
    }

-    /* common handler for all stt engine errors */
-    ep.addCustomEventListener(JambonzTranscriptionEvents.Error, this._onJambonzError.bind(this, cs, ep));
    await ep.set(opts)
      .catch((err) => this.logger.info(err, 'Error setting channel variables'));

@@ -259,11 +259,8 @@ class TaskTranscribe extends Task {
    this.logger.debug({evt}, 'TaskTranscribe:_onTranscription - before normalization');

    evt = this.normalizeTranscription(evt, this.vendor, channel, this.language);
+
    this.logger.debug({evt}, 'TaskTranscribe:_onTranscription');
-    if (evt.alternatives.length === 0) {
-      this.logger.info({evt}, 'TaskTranscribe:_onTranscription - got empty transcript, continue listening');
-      return;
-    }

    if (evt.alternatives[0]?.transcript === '' && !cs.callGone && !this.killed) {
      if (['microsoft', 'deepgram'].includes(this.vendor)) {
@@ -276,15 +273,6 @@ class TaskTranscribe extends Task {
      return;
    }

-    if (this.vendor === 'soniox') {
-      /* compile transcripts into one */
-      this._sonioxTranscripts.push(evt.vendor.finalWords);
-      if (evt.is_final) {
-        evt = this.compileSonioxTranscripts(this._sonioxTranscripts, 1, this.language);
-        this._sonioxTranscripts = [];
-      }
-    }
-
    if (this.transcriptionHook) {
      const b3 = this.getTracingPropagation();
      const httpHeaders = b3 && {b3};
@@ -333,6 +321,23 @@ class TaskTranscribe extends Task {
      this._timer = null;
    }
  }
+  _onNuanceError(_cs, _ep, _channel, evt) {
+    const {code, error, details} = evt;
+    if (code === 404 && error === 'No speech') {
+      this.logger.debug({code, error, details}, 'TaskTranscribe:_onNuanceError');
+      return this._resolve('timeout');
+    }
+    this.logger.info({code, error, details}, 'TaskTranscribe:_onNuanceError');
+    if (code === 413 && error === 'Too much speech') {
+      return this._resolve('timeout');
+    }
+  }
+  _onSonioxError(cs, ep, evt) {
+    this.logger.info({evt}, 'TaskTranscribe:_onSonioxError');
+  }
+  _onNvidiaError(cs, ep, evt) {
+    this.logger.info({evt}, 'TaskTranscribe:_onNvidiaError');
+  }
  _onDeepgramConnect(_cs, _ep) {
    this.logger.debug('TaskTranscribe:_onDeepgramConnect');
  }
@@ -371,24 +376,6 @@ class TaskTranscribe extends Task {
  _onIbmError(cs, _ep, _channel, evt) {
    this.logger.info({evt}, 'TaskTranscribe:_onIbmError');
  }
-  _onJambonzError(cs, _ep, evt) {
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    const {writeAlerts, AlertType} = cs.srf.locals;
-
-    if (this.vendor === 'nuance') {
-      const {code, error} = evt;
-      if (code === 404 && error === 'No speech') return this._resolve('timeout');
-      if (code === 413 && error === 'Too much speech') return this._resolve('timeout');
-    }
-    this.logger.info({evt}, 'TaskTranscribe:_onJambonzError');
-    writeAlerts({
-      account_sid: cs.accountSid,
-      alert_type: AlertType.STT_FAILURE,
-      message: `Custom speech vendor ${this.vendor} error: ${evt.error}`,
-      vendor: this.vendor,
-    }).catch((err) => this.logger.info({err}, 'Error generating alert for jambonz custom connection failure'));
-    this.notifyError({msg: 'ASR error', details:`Custom speech vendor ${this.vendor} error: ${evt.error}`});
-  }


 }
--- a/lib/utils/amd-utils.js
+++ b/lib/utils/amd-utils.js
@@ -1,21 +1,14 @@
 const Emitter = require('events');
 const {readFile} = require('fs');
 const {
-  TaskName,
  GoogleTranscriptionEvents,
  AwsTranscriptionEvents,
  AzureTranscriptionEvents,
-  NuanceTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  IbmTranscriptionEvents,
-  SonioxTranscriptionEvents,
-  DeepgramTranscriptionEvents,
-  JambonzTranscriptionEvents,
  AmdEvents,
  AvmdEvents
 } = require('./constants');
 const bugname = 'amd_bug';
-const {VMD_HINTS_FILE} = require('../config');
+const {VMD_HINTS_FILE} = process.env;
 let voicemailHints = [];

 const updateHints = async(file, callback) => {
@@ -61,11 +54,6 @@ class Amd extends Emitter {
    this.thresholdWordCount = opts.thresholdWordCount || 9;
    const {normalizeTranscription} = require('./transcription-utils')(logger);
    this.normalizeTranscription = normalizeTranscription;
-    const {getNuanceAccessToken, getIbmAccessToken} = cs.srf.locals.dbHelpers;
-    this.getNuanceAccessToken = getNuanceAccessToken;
-    this.getIbmAccessToken = getIbmAccessToken;
-    const {setChannelVarsForStt} = require('./transcription-utils')(logger);
-    this.setChannelVarsForStt = setChannelVarsForStt;

    const {
      noSpeechTimeoutMs = 5000,
@@ -196,7 +184,7 @@ module.exports = (logger) => {
    const {vendor, language} = ep.amd;
    ep.startTranscription({
      vendor,
-      locale: language,
+      language,
      interim: true,
      bugname
    }).catch((err) => {
@@ -241,92 +229,52 @@ module.exports = (logger) => {

  const startAmd = async(cs, ep, task, opts) => {
    const amd = ep.amd = new Amd(logger, cs, opts);
-    const {vendor, language} = amd;
-    let sttCredentials = amd.sttCredentials;
+    const {vendor, language, sttCredentials} = amd;
+    const sttOpts = {};
    const hints = voicemailHints[language] || [];

-    if (vendor === 'nuance' && sttCredentials.client_id) {
-      /* get nuance access token */
-      const {getNuanceAccessToken} = amd;
-      const {client_id, secret} = sttCredentials;
-      const {access_token, servedFromCache} = await getNuanceAccessToken(client_id, secret, 'asr tts');
-      logger.debug({client_id}, `Gather:exec - got nuance access token ${servedFromCache ? 'from cache' : ''}`);
-      sttCredentials = {...sttCredentials, access_token};
-    }
-    else if (vendor == 'ibm' && sttCredentials.stt_api_key) {
-      /* get ibm access token */
-      const {getIbmAccessToken} = amd;
-      const {stt_api_key, stt_region} = sttCredentials;
-      const {access_token, servedFromCache} = await getIbmAccessToken(stt_api_key);
-      logger.debug({stt_api_key}, `Gather:exec - got ibm access token ${servedFromCache ? 'from cache' : ''}`);
-      sttCredentials = {...sttCredentials, access_token, stt_region};
-    }
-
    /* set stt options */
    logger.info(`starting amd for vendor ${vendor} and language ${language}`);
-    const sttOpts = amd.setChannelVarsForStt({name: TaskName.Gather}, sttCredentials, {
-      vendor,
-      hints,
-      enhancedModel: true,
-      altLanguages: opts.recognizer?.altLanguages || [],
-      initialSpeechTimeoutMs: opts.resolveTimeoutMs,
-    });
+    if ('google' === vendor) {
+      sttOpts.GOOGLE_APPLICATION_CREDENTIALS = JSON.stringify(sttCredentials.credentials);
+      sttOpts.GOOGLE_SPEECH_USE_ENHANCED = true;
+      sttOpts.GOOGLE_SPEECH_HINTS = hints.join(',');
+      if (opts.recognizer?.altLanguages) {
+        sttOpts.GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
+      }
+      ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+      ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, onEndOfUtterance.bind(null, cs, ep, task));
+    }
+    else if (['aws', 'polly'].includes(vendor)) {
+      Object.assign(sttOpts, {
+        AWS_ACCESS_KEY_ID: sttCredentials.accessKeyId,
+        AWS_SECRET_ACCESS_KEY: sttCredentials.secretAccessKey,
+        AWS_REGION: sttCredentials.region
+      });
+      ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+    }
+    else if ('microsoft' === vendor) {
+      Object.assign(sttOpts, {
+        'AZURE_SUBSCRIPTION_KEY': sttCredentials.api_key,
+        'AZURE_REGION': sttCredentials.region
+      });
+      sttOpts.AZURE_SPEECH_HINTS = hints.join(',');
+      if (opts.recognizer?.altLanguages) {
+        sttOpts.AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES = opts.recognizer.altLanguages.join(',');
+      }
+      sttOpts.AZURE_INITIAL_SPEECH_TIMEOUT_MS = opts.resolveTimeoutMs || 20000;

+      ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, onTranscription.bind(null, cs, ep, task));
+      ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, onNoSpeechDetected.bind(null, cs, ep, task));
+    }
+    logger.debug({sttOpts}, 'startAmd: setting channel vars');
    await ep.set(sttOpts).catch((err) => logger.info(err, 'Error setting channel variables'));

-    amd.transcriptionHandler = onTranscription.bind(null, cs, ep, task);
-    amd.EndOfUtteranceHandler = onEndOfUtterance.bind(null, cs, ep, task);
-    amd.noSpeechHandler = onNoSpeechDetected.bind(null, cs, ep, task);
-
-    switch (vendor) {
-      case 'google':
-        ep.addCustomEventListener(GoogleTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        ep.addCustomEventListener(GoogleTranscriptionEvents.EndOfUtterance, amd.EndOfUtteranceHandler);
-        break;
-
-      case 'aws':
-      case 'polly':
-        ep.addCustomEventListener(AwsTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-      case 'microsoft':
-        ep.addCustomEventListener(AzureTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        ep.addCustomEventListener(AzureTranscriptionEvents.NoSpeechDetected, amd.noSpeechHandler);
-        break;
-      case 'nuance':
-        ep.addCustomEventListener(NuanceTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'deepgram':
-        ep.addCustomEventListener(DeepgramTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'soniox':
-        amd.bugname = 'soniox_amd_transcribe';
-        ep.addCustomEventListener(SonioxTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'ibm':
-        ep.addCustomEventListener(IbmTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      case 'nvidia':
-        ep.addCustomEventListener(NvidiaTranscriptionEvents.Transcription, amd.transcriptionHandler);
-        break;
-
-      default:
-        if (vendor.startsWith('custom:')) {
-          ep.addCustomEventListener(JambonzTranscriptionEvents.Transcription, amd.transcriptionHandler);
-          break;
-        }
-        else {
-          throw new Error(`Invalid vendor ${this.vendor}`);
-        }
-    }
    amd
      .on(AmdEvents.NoSpeechDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.NoSpeechDetected, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -334,7 +282,7 @@ module.exports = (logger) => {
      .on(AmdEvents.HumanDetected, (evt) => {
        task.emit('amd', {type: AmdEvents.HumanDetected, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -345,7 +293,7 @@ module.exports = (logger) => {
      .on(AmdEvents.DecisionTimeout, (evt) => {
        task.emit('amd', {type: AmdEvents.DecisionTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -353,7 +301,7 @@ module.exports = (logger) => {
      .on(AmdEvents.ToneTimeout, (evt) => {
        //task.emit('amd', {type: AmdEvents.ToneTimeout, ...evt});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.execute('avmd_stop').catch((err) => logger.info(err, 'Error stopping avmd'));
        } catch (err) {
          logger.info({err}, 'Error stopping avmd');
        }
@@ -361,7 +309,7 @@ module.exports = (logger) => {
      .on(AmdEvents.MachineStoppedSpeaking, () => {
        task.emit('amd', {type: AmdEvents.MachineStoppedSpeaking});
        try {
-          stopAmd(ep, task);
+          ep.connected && ep.stopTranscription({vendor, bugname});
        } catch (err) {
          logger.info({err}, 'Error stopping transcription');
        }
@@ -380,19 +328,6 @@ module.exports = (logger) => {
    if (ep.amd) {
      vendor = ep.amd.vendor;
      ep.amd.stopAllTimers();
-
-      ep.removeListener(GoogleTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(GoogleTranscriptionEvents.EndOfUtterance, ep.amd.EndOfUtteranceHandler);
-      ep.removeListener(AwsTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(AzureTranscriptionEvents.NoSpeechDetected, ep.amd.noSpeechHandler);
-      ep.removeListener(NuanceTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(DeepgramTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(SonioxTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(IbmTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(NvidiaTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-      ep.removeListener(JambonzTranscriptionEvents.Transcription, ep.amd.transcriptionHandler);
-
      ep.amd = null;
    }

--- a/lib/utils/aws-sns-lifecycle.js
+++ b/lib/utils/aws-sns-lifecycle.js
@@ -1,12 +1,7 @@
 const Emitter = require('events');
 const bent = require('bent');
 const assert = require('assert');
-const {
-  AWS_REGION,
-  AWS_SNS_PORT: PORT,
-  AWS_SNS_TOPIC_ARM,
-  AWS_SNS_PORT_MAX,
-} = require('../config');
+const PORT = process.env.AWS_SNS_PORT || 3010;
 const {LifeCycleEvents} = require('./constants');
 const express = require('express');
 const app = express();
@@ -18,7 +13,7 @@ const {Parser} = require('xml2js');
 const parser = new Parser();
 const {validatePayload} = require('verify-aws-sns-signature');

-AWS.config.update({region: AWS_REGION});
+AWS.config.update({region: process.env.AWS_REGION});

 class SnsNotifier extends Emitter {
  constructor(logger) {
@@ -36,8 +31,8 @@ class SnsNotifier extends Emitter {

  _handleErrors(logger, app, resolve, reject, e) {
    if (e.code === 'EADDRINUSE' &&
-      AWS_SNS_PORT_MAX &&
-      e.port < AWS_SNS_PORT_MAX) {
+      process.env.AWS_SNS_PORT_MAX &&
+      e.port < process.env.AWS_SNS_PORT_MAX) {

      logger.info(`SNS lifecycle server failed to bind port on ${e.port}, will try next port`);
      const server = this._doListen(logger, app, ++e.port, resolve);
@@ -137,12 +132,12 @@ class SnsNotifier extends Emitter {
    try {
      const response = await sns.subscribe({
        Protocol: 'http',
-        TopicArn: AWS_SNS_TOPIC_ARM,
+        TopicArn: process.env.AWS_SNS_TOPIC_ARM,
        Endpoint: this.snsEndpoint
      }).promise();
-      this.logger.info({response}, `response to SNS subscribe to ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS subscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
-      this.logger.error({err}, `Error subscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error subscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

@@ -152,9 +147,9 @@ class SnsNotifier extends Emitter {
      const response = await sns.unsubscribe({
        SubscriptionArn: this.subscriptionArn
      }).promise();
-      this.logger.info({response}, `response to SNS unsubscribe to ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.info({response}, `response to SNS unsubscribe to ${process.env.AWS_SNS_TOPIC_ARM}`);
    } catch (err) {
-      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${AWS_SNS_TOPIC_ARM}`);
+      this.logger.error({err}, `Error unsubscribing to SNS topic arn ${process.env.AWS_SNS_TOPIC_ARM}`);
    }
  }

--- a/lib/utils/base-requestor.js
+++ b/lib/utils/base-requestor.js
@@ -2,7 +2,6 @@ const assert = require('assert');
 const Emitter = require('events');
 const crypto = require('crypto');
 const timeSeries = require('@jambonz/time-series');
-const {NODE_ENV, JAMBONES_TIME_SERIES_HOST} = require('../config');
 let alerter ;

 class BaseRequestor extends Emitter {
@@ -23,9 +22,9 @@ class BaseRequestor extends Emitter {

    if (!alerter) {
      alerter = timeSeries(logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
  }
--- a/lib/utils/constants.json
+++ b/lib/utils/constants.json
@@ -110,12 +110,6 @@
    "NoSpeechDetected": "azure_transcribe::no_speech_detected",
    "VadDetected": "azure_transcribe::vad_detected"
  },
-  "JambonzTranscriptionEvents": {
-    "Transcription": "jambonz_transcribe::transcription",
-    "ConnectFailure": "jambonz_transcribe::connect_failed",
-    "Connect": "jambonz_transcribe::connect",
-    "Error": "jambonz_transcribe::error"
-  },
  "ListenEvents": {
    "Connect": "mod_audio_fork::connect",
    "ConnectFailure": "mod_audio_fork::connect_failed",
--- a/lib/utils/cron-jobs.js
+++ b/lib/utils/cron-jobs.js
@@ -1,24 +1,19 @@
 const {execSync} = require('child_process');
-const {
-  JAMBONES_FREESWITCH,
-  NODE_ENV,
-  JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS,
-} = require('../config');
 const now = Date.now();
-const fsInventory = JAMBONES_FREESWITCH
+const fsInventory = process.env.JAMBONES_FREESWITCH
  .split(',')
  .map((fs) => {
    const arr = /^([^:]*):([^:]*):([^:]*)(?::([^:]*))?/.exec(fs);
    const opts = {address: arr[1], port: arr[2], secret: arr[3]};
    if (arr.length > 4) opts.advertisedAddress = arr[4];
-    if (NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
+    if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
    return opts;
  });

 const clearChannels = () => {
  const {logger} = require('../..');
  const pwd = fsInventory[0].secret;
-  const maxDurationMins = JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS;
+  const maxDurationMins = process.env.JAMBONES_FREESWITCH_MAX_CALL_DURATION_MINS || 180;

  const calls = execSync(`/usr/local/freeswitch/bin/fs_cli -p ${pwd} -x "show calls"`, {encoding: 'utf8'})
    .split('\n')
--- a/lib/utils/db-utils.js
+++ b/lib/utils/db-utils.js
@@ -20,16 +20,6 @@ WHERE vc.account_sid IS NULL
 AND vc.service_provider_sid = 
 (SELECT service_provider_sid from accounts where account_sid = ?) 
 AND vc.name = ?`;
-const sqlQueryAccountPhoneNumber = `SELECT voip_carrier_sid 
-FROM phone_numbers pn
-WHERE pn.account_sid = ?
-AND pn.number = ?`;
-const sqlQuerySPPhoneNumber = `SELECT voip_carrier_sid  
-FROM phone_numbers pn 
-WHERE pn.account_sid IS NULL 
-AND pn.service_provider_sid = 
-(SELECT service_provider_sid from accounts where account_sid = ?) 
-AND pn.number = ?`;

 const speechMapper = (cred) => {
  const {credential, ...obj} = cred;
@@ -60,8 +50,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.client_id = o.client_id;
      obj.secret = o.secret;
-      obj.nuance_tts_uri = o.nuance_tts_uri;
-      obj.nuance_stt_uri = o.nuance_stt_uri;
    }
    else if ('ibm' === obj.vendor) {
      const o = JSON.parse(decrypt(credential));
@@ -78,16 +66,6 @@ const speechMapper = (cred) => {
      const o = JSON.parse(decrypt(credential));
      obj.api_key = o.api_key;
    }
-    else if ('nvidia' === obj.vendor) {
-      const o = JSON.parse(decrypt(credential));
-      obj.riva_server_uri = o.riva_server_uri;
-    }
-    else if (obj.vendor.startsWith('custom:')) {
-      const o = JSON.parse(decrypt(credential));
-      obj.auth_token = o.auth_token;
-      obj.custom_stt_url = o.custom_stt_url;
-      obj.custom_tts_url = o.custom_tts_url;
-    }
  } catch (err) {
    console.log(err);
  }
@@ -100,18 +78,58 @@ module.exports = (logger, srf) => {

  const lookupAccountDetails = async(account_sid) => {

-    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, [account_sid]);
+    const [r] = await pp.query({sql: sqlAccountDetails, nestTables: true}, account_sid);
    if (0 === r.length) throw new Error(`invalid accountSid: ${account_sid}`);
-    const [r2] = await pp.query(sqlSpeechCredentials, [account_sid]);
+    const [r2] = await pp.query(sqlSpeechCredentials, account_sid);
    const speech = r2.map(speechMapper);

-    /* add service provider creds unless we have that vendor at the account level */
-    const [r3] = await pp.query(sqlSpeechCredentialsForSP, [account_sid]);
-    r3.forEach((s) => {
-      if (!speech.find((s2) => s2.vendor === s.vendor)) {
-        speech.push(speechMapper(s));
+    /* search at the service provider level if we don't find it at the account level */
+    const haveGoogle = speech.find((s) => s.vendor === 'google');
+    const haveAws = speech.find((s) => s.vendor === 'aws');
+    const haveMicrosoft = speech.find((s) => s.vendor === 'microsoft');
+    const haveWellsaid = speech.find((s) => s.vendor === 'wellsaid');
+    const haveNuance = speech.find((s) => s.vendor === 'nuance');
+    const haveDeepgram = speech.find((s) => s.vendor === 'deepgram');
+    const haveSoniox = speech.find((s) => s.vendor === 'soniox');
+    const haveIbm = speech.find((s) => s.vendor === 'ibm');
+    if (!haveGoogle || !haveAws || !haveMicrosoft || !haveWellsaid ||
+      !haveNuance || !haveIbm || !haveDeepgram || !haveSoniox) {
+      const [r3] = await pp.query(sqlSpeechCredentialsForSP, account_sid);
+      if (r3.length) {
+        if (!haveGoogle) {
+          const google = r3.find((s) => s.vendor === 'google');
+          if (google) speech.push(speechMapper(google));
+        }
+        if (!haveAws) {
+          const aws = r3.find((s) => s.vendor === 'aws');
+          if (aws) speech.push(speechMapper(aws));
+        }
+        if (!haveMicrosoft) {
+          const ms = r3.find((s) => s.vendor === 'microsoft');
+          if (ms) speech.push(speechMapper(ms));
+        }
+        if (!haveWellsaid) {
+          const wellsaid = r3.find((s) => s.vendor === 'wellsaid');
+          if (wellsaid) speech.push(speechMapper(wellsaid));
+        }
+        if (!haveNuance) {
+          const nuance = r3.find((s) => s.vendor === 'nuance');
+          if (nuance) speech.push(speechMapper(nuance));
+        }
+        if (!haveDeepgram) {
+          const deepgram = r3.find((s) => s.vendor === 'deepgram');
+          if (deepgram) speech.push(speechMapper(deepgram));
+        }
+        if (!haveSoniox) {
+          const soniox = r3.find((s) => s.vendor === 'soniox');
+          if (soniox) speech.push(speechMapper(soniox));
+        }
+        if (!haveIbm) {
+          const ibm = r3.find((s) => s.vendor === 'ibm');
+          if (ibm) speech.push(speechMapper(ibm));
+        }
      }
-    });
+    }

    return {
      ...r[0],
@@ -142,22 +160,9 @@ module.exports = (logger, srf) => {
    }
  };

-  const lookupCarrierByPhoneNumber = async(account_sid, phoneNumber) => {
-    const pp = pool.promise();
-    try {
-      const [r] = await pp.query(sqlQueryAccountPhoneNumber, [account_sid, phoneNumber]);
-      if (r.length) return r[0].voip_carrier_sid;
-      const [r2] = await pp.query(sqlQuerySPPhoneNumber, [account_sid, phoneNumber]);
-      if (r2.length) return r2[0].voip_carrier_sid;
-    } catch (err) {
-      logger.error({err}, `lookupPhoneNumber: Error ${account_sid}:${phoneNumber}`);
-    }
-  };
-
  return {
    lookupAccountDetails,
    updateSpeechCredentialLastUsed,
-    lookupCarrier,
-    lookupCarrierByPhoneNumber
+    lookupCarrier
  };
 };
--- a/lib/utils/encrypt-decrypt.js
+++ b/lib/utils/encrypt-decrypt.js
@@ -1,11 +1,10 @@
 const crypto = require('crypto');
-const {LEGACY_CRYPTO, ENCRYPTION_SECRET, JWT_SECRET} = require('../config');
-const algorithm = LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
+const algorithm = process.env.LEGACY_CRYPTO ? 'aes-256-ctr' : 'aes-256-cbc';
 const iv = crypto.randomBytes(16);
 const secretKey = crypto.createHash('sha256')
-  .update(ENCRYPTION_SECRET || JWT_SECRET)
+  .update(String(process.env.JWT_SECRET))
  .digest('base64')
-  .substring(0, 32);
+  .substr(0, 32);

 const encrypt = (text) => {
  const cipher = crypto.createCipheriv(algorithm, secretKey, iv);
@@ -26,8 +25,8 @@ const decrypt = (data) => {
    throw err;
  }
  const decipher = crypto.createDecipheriv(algorithm, secretKey, Buffer.from(hash.iv, 'hex'));
-  const decrypted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
-  return decrypted.toString();
+  const decrpyted = Buffer.concat([decipher.update(Buffer.from(hash.content, 'hex')), decipher.final()]);
+  return decrpyted.toString();
 };

 module.exports = {
--- a/lib/utils/http-listener.js
+++ b/lib/utils/http-listener.js
@@ -1,7 +1,7 @@

 const express = require('express');
 const httpRoutes = require('../http-routes');
-const {PORT, HTTP_PORT_MAX} = require('../config');
+const PORT = process.env.HTTP_PORT || 3000;

 const doListen = (logger, app, port, resolve) => {
  const server = app.listen(port, () => {
@@ -13,8 +13,8 @@ const doListen = (logger, app, port, resolve) => {
 };
 const handleErrors = (logger, app, resolve, reject, e) => {
  if (e.code === 'EADDRINUSE' &&
-    HTTP_PORT_MAX &&
-    e.port < HTTP_PORT_MAX) {
+    process.env.HTTP_PORT_MAX &&
+    e.port < process.env.HTTP_PORT_MAX) {

    logger.info(`HTTP server failed to bind port on ${e.port}, will try next port`);
    const server = doListen(logger, app, ++e.port, resolve);
--- a/lib/utils/http-requestor.js
+++ b/lib/utils/http-requestor.js
@@ -5,12 +5,7 @@ const BaseRequestor = require('./base-requestor');
 const {HookMsgTypes} = require('./constants.json');
 const snakeCaseKeys = require('./snakecase-keys');
 const pools = new Map();
-const {
-  HTTP_POOL,
-  HTTP_POOLSIZE,
-  HTTP_PIPELINING,
-  HTTP_TIMEOUT,
-} = require('../config');
+const HTTP_TIMEOUT = 10000;

 const toBase64 = (str) => Buffer.from(str || '', 'utf8').toString('base64');

@@ -39,15 +34,15 @@ class HttpRequestor extends BaseRequestor {
    this._resource = u.resource;
    this._port = u.port;
    this._search = u.search;
-    this._usePools = HTTP_POOL && parseInt(HTTP_POOL);
+    this._usePools = process.env.HTTP_POOL && parseInt(process.env.HTTP_POOL);

    if (this._usePools) {
      if (pools.has(this._baseUrl)) {
        this.client = pools.get(this._baseUrl);
      }
      else {
-        const connections = HTTP_POOLSIZE ? parseInt(HTTP_POOLSIZE) : 10;
-        const pipelining = HTTP_PIPELINING ? parseInt(HTTP_PIPELINING) : 1;
+        const connections = process.env.HTTP_POOLSIZE ? parseInt(process.env.HTTP_POOLSIZE) : 10;
+        const pipelining = process.env.HTTP_PIPELINING ? parseInt(process.env.HTTP_PIPELINING) : 1;
        const pool = this.client = new Pool(this._baseUrl, {
          connections,
          pipelining
--- a/lib/utils/install-srf-locals.js
+++ b/lib/utils/install-srf-locals.js
@@ -1,21 +1,6 @@
 const Mrf = require('drachtio-fsmrf');
 const ip = require('ip');
-const {
-  JAMBONES_MYSQL_HOST,
-  JAMBONES_MYSQL_USER,
-  JAMBONES_MYSQL_PASSWORD,
-  JAMBONES_MYSQL_DATABASE,
-  JAMBONES_MYSQL_CONNECTION_LIMIT,
-  JAMBONES_MYSQL_PORT,
-  JAMBONES_FREESWITCH,
-  JAMBONES_REDIS_HOST,
-  JAMBONES_REDIS_PORT,
-  SMPP_URL,
-  JAMBONES_TIME_SERIES_HOST,
-  JAMBONES_ESL_LISTEN_ADDRESS,
-  PORT,
-  NODE_ENV,
-} = require('../config');
+const PORT = process.env.HTTP_PORT || 3000;
 const assert = require('assert');

 function initMS(logger, wrapper, ms) {
@@ -57,18 +42,18 @@ function installSrfLocals(srf, logger) {
  let idxStart = 0;

  (async function() {
-    const fsInventory = JAMBONES_FREESWITCH
+    const fsInventory = process.env.JAMBONES_FREESWITCH
      .split(',')
      .map((fs) => {
        const arr = /^([^:]*):([^:]*):([^:]*)(?::([^:]*))?/.exec(fs);
-        assert.ok(arr, `Invalid syntax JAMBONES_FREESWITCH: ${JAMBONES_FREESWITCH}`);
+        assert.ok(arr, `Invalid syntax JAMBONES_FREESWITCH: ${process.env.JAMBONES_FREESWITCH}`);
        const opts = {address: arr[1], port: arr[2], secret: arr[3]};
        if (arr.length > 4) opts.advertisedAddress = arr[4];
        /* NB: originally for testing only, but for now all jambonz deployments
          have freeswitch installed locally alongside this app
        */
-        if (NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
-        else if (JAMBONES_ESL_LISTEN_ADDRESS) opts.listenAddress = JAMBONES_ESL_LISTEN_ADDRESS;
+        if (process.env.NODE_ENV === 'test') opts.listenAddress = '0.0.0.0';
+        else if (process.env.JAMBONES_ESL_LISTEN_ADDRESS) opts.listenAddress = process.env.JAMBONES_ESL_LISTEN_ADDRESS;
        return opts;
      });
    logger.info({fsInventory}, 'freeswitch inventory');
@@ -140,12 +125,12 @@ function installSrfLocals(srf, logger) {
    lookupAccountCapacitiesBySid,
    lookupSmppGateways
  } = require('@jambonz/db-helpers')({
-    host: JAMBONES_MYSQL_HOST,
-    user: JAMBONES_MYSQL_USER,
-    port: JAMBONES_MYSQL_PORT || 3306,
-    password: JAMBONES_MYSQL_PASSWORD,
-    database: JAMBONES_MYSQL_DATABASE,
-    connectionLimit: JAMBONES_MYSQL_CONNECTION_LIMIT || 10
+    host: process.env.JAMBONES_MYSQL_HOST,
+    user: process.env.JAMBONES_MYSQL_USER,
+    port: process.env.JAMBONES_MYSQL_PORT || 3306,
+    password: process.env.JAMBONES_MYSQL_PASSWORD,
+    database: process.env.JAMBONES_MYSQL_DATABASE,
+    connectionLimit: process.env.JAMBONES_MYSQL_CONNECTION_LIMIT || 10
  }, logger, tracer);
  const {
    client,
@@ -153,6 +138,7 @@ function installSrfLocals(srf, logger) {
    retrieveCall,
    listCalls,
    deleteCall,
+    synthAudio,
    createHash,
    retrieveHash,
    deleteKey,
@@ -165,27 +151,21 @@ function installSrfLocals(srf, logger) {
    pushBack,
    popFront,
    removeFromList,
-    getListPosition,
    lengthOfList,
-  } = require('@jambonz/realtimedb-helpers')({
-    host: JAMBONES_REDIS_HOST,
-    port: JAMBONES_REDIS_PORT || 6379
-  }, logger, tracer);
-  const {
-    synthAudio,
+    getListPosition,
    getNuanceAccessToken,
    getIbmAccessToken,
-  } = require('@jambonz/speech-utils')({
-    host: JAMBONES_REDIS_HOST,
-    port: JAMBONES_REDIS_PORT || 6379
+  } = require('@jambonz/realtimedb-helpers')({
+    host: process.env.JAMBONES_REDIS_HOST,
+    port: process.env.JAMBONES_REDIS_PORT || 6379
  }, logger, tracer);
  const {
    writeAlerts,
    AlertType
  } = require('@jambonz/time-series')(logger, {
-    host: JAMBONES_TIME_SERIES_HOST,
+    host: process.env.JAMBONES_TIME_SERIES_HOST,
    commitSize: 50,
-    commitInterval: 'test' === NODE_ENV ? 7 : 20
+    commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
  });

  let localIp;
@@ -233,7 +213,7 @@ function installSrfLocals(srf, logger) {
    parentLogger: logger,
    getSBC,
    getSmpp: () => {
-      return SMPP_URL;
+      return process.env.SMPP_URL;
    },
    lifecycleEmitter,
    getFreeswitch,
--- a/lib/utils/requestor.js
+++ b/lib/utils/requestor.js
@@ -1,9 +1,5 @@
 const assert = require('assert');
 const timeSeries = require('@jambonz/time-series');
-const {
-  NODE_ENV,
-  JAMBONES_TIME_SERIES_HOST
-} = require('../config');
 let alerter ;

 function isAbsoluteUrl(u) {
@@ -32,9 +28,9 @@ class Requestor {

    if (!alerter) {
      alerter = timeSeries(logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
  }
@@ -42,9 +38,9 @@ class Requestor {
  get Alerter() {
    if (!alerter) {
      alerter = timeSeries(this.logger, {
-        host: JAMBONES_TIME_SERIES_HOST,
+        host: process.env.JAMBONES_TIME_SERIES_HOST,
        commitSize: 50,
-        commitInterval: 'test' === NODE_ENV ? 7 : 20
+        commitInterval: 'test' === process.env.NODE_ENV ? 7 : 20
      });
    }
    return alerter;
--- a/lib/utils/sbc-pinger.js
+++ b/lib/utils/sbc-pinger.js
@@ -4,38 +4,28 @@ const {LifeCycleEvents, FS_UUID_SET_NAME} = require('./constants');
 const Emitter = require('events');
 const debug = require('debug')('jambonz:feature-server');
 const noopLogger = {info: () => {}, error: () => {}};
-const {
-  JAMBONES_SBCS,
-  K8S,
-  K8S_SBC_SIP_SERVICE_NAME,
-  AWS_SNS_TOPIC_ARM,
-  OPTIONS_PING_INTERVAL,
-  AWS_REGION,
-  NODE_ENV,
-  JAMBONES_CLUSTER_ID,
-} = require('../config');

 module.exports = (logger) => {
  logger = logger || noopLogger;
  let idxSbc = 0;
  let sbcs = [];

-  if (JAMBONES_SBCS) {
-    sbcs = JAMBONES_SBCS
+  if (process.env.JAMBONES_SBCS) {
+    sbcs = process.env.JAMBONES_SBCS
      .split(',')
      .map((sbc) => sbc.trim());
    assert.ok(sbcs.length, 'JAMBONES_SBCS env var is empty or misconfigured');
    logger.info({sbcs}, 'SBC inventory');
  }
-  else if (K8S && K8S_SBC_SIP_SERVICE_NAME) {
-    sbcs = [`${K8S_SBC_SIP_SERVICE_NAME}:5060`];
+  else if (process.env.K8S && process.env.K8S_SBC_SIP_SERVICE_NAME) {
+    sbcs = [`${process.env.K8S_SBC_SIP_SERVICE_NAME}:5060`];
    logger.info({sbcs}, 'SBC inventory');
  }

  // listen for SNS lifecycle changes
  let lifecycleEmitter = new Emitter();
  let dryUpCalls = false;
-  if (AWS_SNS_TOPIC_ARM && AWS_REGION) {
+  if (process.env.AWS_SNS_TOPIC_ARM && process.env.AWS_REGION) {

    (async function() {
      try {
@@ -85,13 +75,13 @@ module.exports = (logger) => {
      }
    })();
  }
-  else if (K8S) {
+  else if (process.env.K8S) {
    lifecycleEmitter.scaleIn = () => process.exit(0);
  }


  async function pingProxies(srf) {
-    if (NODE_ENV === 'test') return;
+    if (process.env.NODE_ENV === 'test') return;

    for (const sbc of sbcs) {
      try {
@@ -112,7 +102,7 @@ module.exports = (logger) => {
      }
    }
  }
-  if (K8S) {
+  if (process.env.K8S) {
    setImmediate(() => {
      logger.info('disabling OPTIONS pings since we are running as a kubernetes service');
      const {srf} = require('../..');
@@ -133,16 +123,16 @@ module.exports = (logger) => {
    setInterval(() => {
      const {srf} = require('../..');
      pingProxies(srf);
-    }, OPTIONS_PING_INTERVAL);
+    }, process.env.OPTIONS_PING_INTERVAL || 30000);

    // initial ping once we are up
    setTimeout(async() => {

      // if SBCs are auto-scaling, monitor them as they come and go
      const {srf} = require('../..');
-      if (!JAMBONES_SBCS) {
+      if (!process.env.JAMBONES_SBCS) {
        const {monitorSet} = srf.locals.dbHelpers;
-        const setName = `${(JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
+        const setName = `${(process.env.JAMBONES_CLUSTER_ID || 'default')}:active-sip`;
        await monitorSet(setName, 10, (members) => {
          sbcs = members;
          logger.info(`sbc-pinger: SBC roster has changed, list of active SBCs is now ${sbcs}`);
--- a/lib/utils/siprec-utils.js
+++ b/lib/utils/siprec-utils.js
@@ -47,16 +47,8 @@ const parseSiprecPayload = (req, logger) => {
      }
    }

-
-    if (!meta && sdp) {
-      const arr = /^([^]+)(m=[^]+?)(m=[^]+?)$/.exec(sdp);
-      opts.sdp1 = `${arr[1]}${arr[2]}`;
-      opts.sdp2 = `${arr[1]}${arr[3]}\r\n`;
-      opts.sessionId = uuidv4();
-      logger.info({ payload: req.payload }, 'SIPREC payload with no metadata (e.g. Cisco NBR)');
-      resolve(opts);
-    } else if (!sdp || !meta) {
-      logger.info({ payload: req.payload }, 'invalid SIPREC payload');
+    if (!sdp || !meta) {
+      logger.info({payload: req.payload}, 'invalid SIPREC payload');
      return reject(new Error('expected multipart SIPREC body'));
    }

@@ -250,8 +242,7 @@ const createSipRecPayload = (sdp1, sdp2, logger) => {
    .replace(/a=sendonly\r\n/g, '')
    .replace(/a=direction:both\r\n/g, '');
  */
-
-  return combinedSdp.replace(/sendrecv/g, 'recvonly');
+  return combinedSdp;
 };

 module.exports = { parseSiprecPayload, createSipRecPayload } ;
--- a/lib/utils/transcription-utils.js
+++ b/lib/utils/transcription-utils.js
@@ -6,8 +6,7 @@ const {
  NuanceTranscriptionEvents,
  DeepgramTranscriptionEvents,
  SonioxTranscriptionEvents,
-  NvidiaTranscriptionEvents,
-  JambonzTranscriptionEvents
+  NvidiaTranscriptionEvents
 } = require('./constants');

 const stickyVars = {
@@ -29,7 +28,6 @@ const stickyVars = {
    'AZURE_SERVICE_ENDPOINT_ID',
    'AZURE_REQUEST_SNR',
    'AZURE_PROFANITY_OPTION',
-    'AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES',
    'AZURE_SERVICE_ENDPOINT',
    'AZURE_INITIAL_SPEECH_TIMEOUT_MS',
    'AZURE_USE_OUTPUT_FORMAT_DETAILED',
@@ -225,15 +223,6 @@ const normalizeGoogle = (evt, channel, language) => {
  };
 };

-const normalizeCustom = (evt, channel, language) => {
-  return {
-    language_code: language,
-    channel_tag: channel,
-    is_final: evt.is_final,
-    alternatives: [evt.alternatives[0]]
-  };
-};
-
 const normalizeNuance = (evt, channel, language) => {
  const copy = JSON.parse(JSON.stringify(evt));
  return {
@@ -313,9 +302,6 @@ module.exports = (logger) => {
      case 'soniox':
        return normalizeSoniox(evt, channel, language);
      default:
-        if (vendor.startsWith('custom:')) {
-          return normalizeCustom(evt, channel, language);
-        }
        logger.error(`Unknown vendor ${vendor}`);
        return evt;
    }
@@ -325,7 +311,6 @@ module.exports = (logger) => {
    let opts = {};
    const {enable, voiceMs = 0, mode = -1} = rOpts.vad || {};
    const vad = {enable, voiceMs, mode};
-    const vendor = rOpts.vendor;

    /* voice activity detection works across vendors */
    opts = {
@@ -335,42 +320,59 @@ module.exports = (logger) => {
      ...(vad.enable && typeof vad.mode === 'number' && {RECOGNIZER_VAD_MODE: vad.mode}),
    };

-    if ('google' === vendor) {
-      const model = task.name === TaskName.Gather ? 'command_and_search' : 'latest_long';
+    if ('google' === rOpts.vendor) {
      opts = {
        ...opts,
-        ...(sttCredentials && {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
-        ...(rOpts.separateRecognitionPerChannel && {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 1}),
-        ...(rOpts.separateRecognitionPerChanne === false && {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 0}),
-        ...(rOpts.profanityFilter && {GOOGLE_SPEECH_PROFANITY_FILTER: 1}),
-        ...(rOpts.punctuation && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 1}),
-        ...(rOpts.words && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 1}),
-        ...(rOpts.singleUtterance && {GOOGLE_SPEECH_SINGLE_UTTERANCE: 1}),
-        ...(rOpts.diarization && {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 1}),
+        ...(sttCredentials &&
+          {GOOGLE_APPLICATION_CREDENTIALS: JSON.stringify(sttCredentials.credentials)}),
+        ...(rOpts.enhancedModel &&
+            {GOOGLE_SPEECH_USE_ENHANCED: 1}),
+        ...(rOpts.separateRecognitionPerChannel &&
+          {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 1}),
+        ...(rOpts.profanityFilter &&
+          {GOOGLE_SPEECH_PROFANITY_FILTER: 1}),
+        ...(rOpts.punctuation &&
+          {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 1}),
+        ...(rOpts.words &&
+          {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 1}),
+        ...((rOpts.singleUtterance ||  task.name === TaskName.Gather) &&
+          {GOOGLE_SPEECH_SINGLE_UTTERANCE: 1}),
+        ...(rOpts.diarization &&
+          {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 1}),
        ...(rOpts.diarization && rOpts.diarizationMinSpeakers > 0 &&
          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MIN_SPEAKER_COUNT: rOpts.diarizationMinSpeakers}),
        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
          {GOOGLE_SPEECH_SPEAKER_DIARIZATION_MAX_SPEAKER_COUNT: rOpts.diarizationMaxSpeakers}),
-        ...(rOpts.enhancedModel !== false && {GOOGLE_SPEECH_USE_ENHANCED: 1}),
-        ...(rOpts.profanityFilter === false && {GOOGLE_SPEECH_PROFANITY_FILTER: 0}),
-        ...(rOpts.punctuation === false && {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 0}),
-        ...(rOpts.words  == false && {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 0}),
-        ...(rOpts.diarization === false && {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 0}),
+        ...(rOpts.enhancedModel === false &&
+          {GOOGLE_SPEECH_USE_ENHANCED: 0}),
+        ...(rOpts.separateRecognitionPerChannel === false &&
+          {GOOGLE_SPEECH_SEPARATE_RECOGNITION_PER_CHANNEL: 0}),
+        ...(rOpts.profanityFilter === false &&
+          {GOOGLE_SPEECH_PROFANITY_FILTER: 0}),
+        ...(rOpts.punctuation === false &&
+          {GOOGLE_SPEECH_ENABLE_AUTOMATIC_PUNCTUATION: 0}),
+        ...(rOpts.words  == false &&
+          {GOOGLE_SPEECH_ENABLE_WORD_TIME_OFFSETS: 0}),
+        ...((rOpts.singleUtterance === false || task.name === TaskName.Transcribe) &&
+          {GOOGLE_SPEECH_SINGLE_UTTERANCE: 0}),
+        ...(rOpts.diarization === false &&
+          {GOOGLE_SPEECH_SPEAKER_DIARIZATION: 0}),
        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
          {GOOGLE_SPEECH_HINTS: rOpts.hints.join(',')}),
        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
          {GOOGLE_SPEECH_HINTS: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' && {GOOGLE_SPEECH_HINTS_BOOST: rOpts.hintsBoost}),
+        ...(typeof rOpts.hintsBoost === 'number' &&
+          {GOOGLE_SPEECH_HINTS_BOOST: rOpts.hintsBoost}),
        ...(rOpts.altLanguages.length > 0 &&
-          {GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
+          {GOOGLE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: rOpts.altLanguages.join(',')}),
        ...(rOpts.interactionType &&
          {GOOGLE_SPEECH_METADATA_INTERACTION_TYPE: rOpts.interactionType}),
-        ...{GOOGLE_SPEECH_MODEL: rOpts.model || model},
-        ...(rOpts.naicsCode > 0 && {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
-        GOOGLE_SPEECH_METADATA_RECORDING_DEVICE_TYPE: 'phone_line',
+        ...{GOOGLE_SPEECH_MODEL: rOpts.model || (task.name === TaskName.Gather ? 'latest_short' : 'phone_call')},
+        ...(rOpts.naicsCode > 0 &&
+          {GOOGLE_SPEECH_METADATA_INDUSTRY_NAICS_CODE: rOpts.naicsCode}),
      };
    }
-    else if (['aws', 'polly'].includes(vendor)) {
+    else if (['aws', 'polly'].includes(rOpts.vendor)) {
      opts = {
        ...opts,
        ...(rOpts.vocabularyName && {AWS_VOCABULARY_NAME: rOpts.vocabularyName}),
@@ -383,7 +385,7 @@ module.exports = (logger) => {
        }),
      };
    }
-    else if ('microsoft' === vendor) {
+    else if ('microsoft' === rOpts.vendor) {
      opts = {
        ...opts,
        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
@@ -391,7 +393,7 @@ module.exports = (logger) => {
        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
          {AZURE_SPEECH_HINTS: rOpts.hints.map((h) => h.phrase).join(',')}),
        ...(rOpts.altLanguages && rOpts.altLanguages.length > 0 &&
-          {AZURE_SPEECH_ALTERNATIVE_LANGUAGE_CODES: [...new Set(rOpts.altLanguages)].join(',')}),
+          {AZURE_SERVICE_ENDPOINT_ID: rOpts.sttCredentials}),
        ...(rOpts.requestSnr && {AZURE_REQUEST_SNR: 1}),
        ...(rOpts.profanityOption && {AZURE_PROFANITY_OPTION: rOpts.profanityOption}),
        ...(rOpts.azureServiceEndpoint && {AZURE_SERVICE_ENDPOINT: rOpts.azureServiceEndpoint}),
@@ -408,7 +410,7 @@ module.exports = (logger) => {
          {AZURE_SERVICE_ENDPOINT_ID: sttCredentials.custom_stt_endpoint})
      };
    }
-    else if ('nuance' === vendor) {
+    else if ('nuance' === rOpts.vendor) {
      /**
       * Note: all nuance options are in recognizer.nuanceOptions, should migrate
       * other vendor settings to similar nested structure
@@ -416,9 +418,12 @@ module.exports = (logger) => {
      const {nuanceOptions = {}} = rOpts;
      opts = {
        ...opts,
-        ...(sttCredentials.access_token) && {NUANCE_ACCESS_TOKEN: sttCredentials.access_token},
-        ...(sttCredentials.nuance_stt_uri) && {NUANCE_KRYPTON_ENDPOINT: sttCredentials.nuance_stt_uri},
-        ...(nuanceOptions.topic) && {NUANCE_TOPIC: nuanceOptions.topic},
+        ...(sttCredentials.access_token) &&
+          {NUANCE_ACCESS_TOKEN: sttCredentials.access_token},
+        ...(sttCredentials.krypton_endpoint) &&
+          {NUANCE_KRYPTON_ENDPOINT: sttCredentials.krypton_endpoint},
+        ...(nuanceOptions.topic) &&
+          {NUANCE_TOPIC: nuanceOptions.topic},
        ...(nuanceOptions.utteranceDetectionMode) &&
          {NUANCE_UTTERANCE_DETECTION_MODE: nuanceOptions.utteranceDetectionMode},
        ...(nuanceOptions.punctuation || rOpts.punctuation) && {NUANCE_PUNCTUATION: nuanceOptions.punctuation},
@@ -456,7 +461,7 @@ module.exports = (logger) => {
          {NUANCE_RESOURCES: JSON.stringify(nuanceOptions.resources)},
      };
    }
-    else if ('deepgram' === vendor) {
+    else if ('deepgram' === rOpts.vendor) {
      const {deepgramOptions = {}} = rOpts;
      opts = {
        ...opts,
@@ -500,7 +505,7 @@ module.exports = (logger) => {
          {DEEPGRAM_SPEECH_TAG: deepgramOptions.tag}
      };
    }
-    else if ('soniox' === vendor) {
+    else if ('soniox' === rOpts.vendor) {
      const {sonioxOptions = {}} = rOpts;
      const {storage = {}} = sonioxOptions;
      opts = {
@@ -523,7 +528,7 @@ module.exports = (logger) => {
        ...(storage?.id && storage?.disableSearch && {SONIOX_STORAGE_DISABLE_SEARCH: 1})
      };
    }
-    else if ('ibm' === vendor) {
+    else if ('ibm' === rOpts.vendor) {
      const {ibmOptions = {}} = rOpts;
      opts = {
        ...opts,
@@ -547,9 +552,8 @@ module.exports = (logger) => {
          {IBM_SPEECH_WATSON_LEARNING_OPT_OUT: ibmOptions.watsonLearningOptOut}
      };
    }
-    else if ('nvidia' === vendor) {
+    else if ('nvidia' === rOpts.vendor) {
      const {nvidiaOptions = {}} = rOpts;
-      const rivaUri = nvidiaOptions.rivaUri || sttCredentials.riva_server_uri;
      opts = {
        ...opts,
        ...((nvidiaOptions.profanityFilter || rOpts.profanityFilter) && {NVIDIA_PROFANITY_FILTER: 1}),
@@ -561,7 +565,7 @@ module.exports = (logger) => {
        ...(nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: nvidiaOptions.maxAlternatives}),
        ...(!nvidiaOptions.maxAlternatives && {NVIDIA_MAX_ALTERNATIVES: 1}),
        ...(rOpts.model && {NVIDIA_MODEL: rOpts.model}),
-        ...(rivaUri && {NVIDIA_RIVA_URI: rivaUri}),
+        ...(nvidiaOptions.rivaUri && {NVIDIA_RIVA_URI: nvidiaOptions.rivaUri}),
        ...(nvidiaOptions.verbatimTranscripts && {NVIDIA_VERBATIM_TRANSCRIPTS: 1}),
        ...(rOpts.diarization && {NVIDIA_SPEAKER_DIARIZATION: 1}),
        ...(rOpts.diarization && rOpts.diarizationMaxSpeakers > 0 &&
@@ -577,29 +581,11 @@ module.exports = (logger) => {
          {NVIDIA_CUSTOM_CONFIGURATION: JSON.stringify(nvidiaOptions.customConfiguration)}),
      };
    }
-    else if (vendor.startsWith('custom:')) {
-      let {options = {}} = rOpts;
-      const {auth_token, custom_stt_url} = sttCredentials;
-      options = {
-        ...options,
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'string' &&
-        {hints: rOpts.hints}),
-        ...(rOpts.hints.length > 0 && typeof rOpts.hints[0] === 'object' &&
-        {hints: JSON.stringify(rOpts.hints)}),
-        ...(typeof rOpts.hintsBoost === 'number' && {hintsBoost: rOpts.hintsBoost})
-      };

-      opts = {
-        ...opts,
-        JAMBONZ_STT_API_KEY: auth_token,
-        JAMBONZ_STT_URL: custom_stt_url,
-        ...(Object.keys(options).length > 0 && {JAMBONZ_STT_OPTIONS: JSON.stringify(options)}),
-      };
-    }
-
-    (stickyVars[vendor] || []).forEach((key) => {
+    stickyVars[rOpts.vendor].forEach((key) => {
      if (!opts[key]) opts[key] = '';
    });
+    //logger.debug({opts}, 'recognizer channel vars');
    return opts;
  };

@@ -618,6 +604,7 @@ module.exports = (logger) => {
    ep.removeCustomEventListener(NuanceTranscriptionEvents.Transcription);
    ep.removeCustomEventListener(NuanceTranscriptionEvents.TranscriptionComplete);
    ep.removeCustomEventListener(NuanceTranscriptionEvents.StartOfSpeech);
+    ep.removeCustomEventListener(NuanceTranscriptionEvents.Error);
    ep.removeCustomEventListener(NuanceTranscriptionEvents.VadDetected);

    ep.removeCustomEventListener(DeepgramTranscriptionEvents.Transcription);
@@ -625,17 +612,13 @@ module.exports = (logger) => {
    ep.removeCustomEventListener(DeepgramTranscriptionEvents.ConnectFailure);

    ep.removeCustomEventListener(SonioxTranscriptionEvents.Transcription);
+    ep.removeCustomEventListener(SonioxTranscriptionEvents.Error);

    ep.removeCustomEventListener(NvidiaTranscriptionEvents.Transcription);
    ep.removeCustomEventListener(NvidiaTranscriptionEvents.TranscriptionComplete);
    ep.removeCustomEventListener(NvidiaTranscriptionEvents.StartOfSpeech);
+    ep.removeCustomEventListener(NvidiaTranscriptionEvents.Error);
    ep.removeCustomEventListener(NvidiaTranscriptionEvents.VadDetected);
-
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Transcription);
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Connect);
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.ConnectFailure);
-
-    ep.removeCustomEventListener(JambonzTranscriptionEvents.Error);
  };

  const setSpeechCredentialsAtRuntime = (recognizer) => {
@@ -643,7 +626,7 @@ module.exports = (logger) => {
    if (recognizer.vendor === 'nuance') {
      const {clientId, secret, kryptonEndpoint} = recognizer.nuanceOptions || {};
      if (clientId && secret) return {client_id: clientId, secret};
-      if (kryptonEndpoint) return {nuance_stt_uri: kryptonEndpoint};
+      if (kryptonEndpoint) return {krypton_endpoint: kryptonEndpoint};
    }
    else if (recognizer.vendor === 'nvidia') {
      const {rivaUri} = recognizer.nvidiaOptions || {};
--- a/lib/utils/ws-requestor.js
+++ b/lib/utils/ws-requestor.js
@@ -4,12 +4,8 @@ const short = require('short-uuid');
 const {HookMsgTypes} = require('./constants.json');
 const Websocket = require('ws');
 const snakeCaseKeys = require('./snakecase-keys');
-const {
-  RESPONSE_TIMEOUT_MS,
-  MAX_RECONNECTS,
-  JAMBONES_WS_HANDSHAKE_TIMEOUT_MS,
-  JAMBONES_WS_MAX_PAYLOAD
-} = require('../config');
+const MAX_RECONNECTS = 5;
+const RESPONSE_TIMEOUT_MS = process.env.JAMBONES_WS_API_MSG_RESPONSE_TIMEOUT || 5000;

 class WsRequestor extends BaseRequestor {
  constructor(logger, account_sid, hook, secret) {
@@ -196,14 +192,14 @@ class WsRequestor extends BaseRequestor {
  _connect() {
    assert(!this.ws);
    return new Promise((resolve, reject) => {
-      const handshakeTimeout = JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
-        parseInt(JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
+      const handshakeTimeout = process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS ?
+        parseInt(process.env.JAMBONES_WS_HANDSHAKE_TIMEOUT_MS) :
        1500;
      let opts = {
        followRedirects: true,
        maxRedirects: 2,
        handshakeTimeout,
-        maxPayload: JAMBONES_WS_MAX_PAYLOAD ? parseInt(JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
+        maxPayload: process.env.JAMBONES_WS_MAX_PAYLOAD ? parseInt(process.env.JAMBONES_WS_MAX_PAYLOAD) : 24 * 1024,
      };
      if (this.username && this.password) opts = {...opts, auth: `${this.username}:${this.password}`};

@@ -223,6 +219,7 @@ class WsRequestor extends BaseRequestor {
  }

  _setHandlers(ws) {
+    this.logger.debug('WsRequestor:_setHandlers');
    ws
      .once('open', this._onOpen.bind(this, ws))
      .once('close', this._onClose.bind(this))
@@ -342,7 +339,7 @@ class WsRequestor extends BaseRequestor {
      this.logger.info({url: this.url}, `WsRequestor:_recvAck - ack to unknown msgid ${msgid}, discarding`);
      return;
    }
-    //this.logger.debug({url: this.url}, `WsRequestor:_recvAck - received response to ${msgid}`);
+    this.logger.debug({url: this.url}, `WsRequestor:_recvAck - received response to ${msgid}`);
    this.messagesInFlight.delete(msgid);
    const {success} = obj;
    success && success(data);
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "jambonz-feature-server",
-  "version": "0.8.3",
+  "version": "v0.8.1",
  "main": "app.js",
  "engines": {
    "node": ">= 10.16.0"
@@ -19,19 +19,17 @@
  "bugs": {},
  "scripts": {
    "start": "node app",
-    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 ENCRYPTION_SECRET=foobar DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
+    "test": "NODE_ENV=test JAMBONES_HOSTING=1 HTTP_POOL=1 DRACHTIO_HOST=127.0.0.1 DRACHTIO_PORT=9060 DRACHTIO_SECRET=cymru JAMBONES_MYSQL_HOST=127.0.0.1 JAMBONES_MYSQL_PORT=3360 JAMBONES_MYSQL_USER=jambones_test JAMBONES_MYSQL_PASSWORD=jambones_test JAMBONES_MYSQL_DATABASE=jambones_test JAMBONES_REDIS_HOST=127.0.0.1 JAMBONES_REDIS_PORT=16379 JAMBONES_LOGLEVEL=error ENABLE_METRICS=0 HTTP_PORT=3000 JAMBONES_SBCS=172.38.0.10 JAMBONES_FREESWITCH=127.0.0.1:8022:JambonzR0ck$:docker-host JAMBONES_TIME_SERIES_HOST=127.0.0.1 JAMBONES_NETWORK_CIDR=172.38.0.0/16 node test/ ",
    "coverage": "./node_modules/.bin/nyc --reporter html --report-dir ./coverage npm run test",
-    "jslint": "eslint app.js tracer.js lib",
-    "jslint:fix": "eslint app.js tracer.js lib --fix"
+    "jslint": "eslint app.js lib"
  },
  "dependencies": {
-    "@jambonz/db-helpers": "^0.8.1",
+    "@jambonz/db-helpers": "^0.7.4",
    "@jambonz/http-health-check": "^0.0.1",
-    "@jambonz/realtimedb-helpers": "^0.7.2",
-    "@jambonz/speech-utils": "^0.0.13",
-    "@jambonz/stats-collector": "^0.1.8",
+    "@jambonz/realtimedb-helpers": "^0.6.5",
+    "@jambonz/stats-collector": "^0.1.6",
    "@jambonz/time-series": "^0.2.5",
-    "@jambonz/verb-specifications": "^0.0.22",
+    "@jambonz/verb-specifications": "^0.0.11",
    "@opentelemetry/api": "^1.4.0",
    "@opentelemetry/exporter-jaeger": "^1.9.0",
    "@opentelemetry/exporter-trace-otlp-http": "^0.35.0",
@@ -45,7 +43,7 @@
    "bent": "^7.3.12",
    "debug": "^4.3.4",
    "deepcopy": "^2.1.0",
-    "drachtio-fsmrf": "^3.0.21",
+    "drachtio-fsmrf": "^3.0.19",
    "drachtio-srf": "^4.5.23",
    "express": "^4.18.2",
    "ip": "^1.1.8",
@@ -62,7 +60,7 @@
    "uuid-random": "^1.3.2",
    "verify-aws-sns-signature": "^0.1.0",
    "ws": "^8.9.0",
-    "xml2js": "^0.5.0"
+    "xml2js": "^0.4.23"
  },
  "devDependencies": {
    "clear-module": "^4.1.2",
--- a/test/create-call-test.js
+++ b/test/create-call-test.js
@@ -106,61 +106,3 @@ test('test create-call call-hook basic authentication', async(t) => {
    t.error(err);
  }
 });
-
-test('test create-call amd', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-
-    // GIVEN
-    let from = 'create-call-amd';
-    let account_sid = 'bb845d4b-83a9-4cde-a6e9-50f3743bab3f';
-
-    // Give UAS app time to come up
-    const p = sippUac('uas.xml', '172.38.0.10', from);
-    await waitFor(1000);
-
-    const post = bent('http://127.0.0.1:3000/', 'POST', 'json', 201);
-    post('v1/createCall', {
-      'account_sid':account_sid,
-      "call_hook": {
-        "url": "http://127.0.0.1:3100/",
-        "method": "POST",
-        "username": "username",
-        "password": "password"
-      },
-      "from": from,
-      "to": {
-        "type": "phone",
-        "number": "15583084809"
-      },
-      "amd": {
-        "actionHook": "/actionHook"
-      },
-      "speech_recognizer_vendor": "google",
-      "speech_recognizer_language": "en"
-    });
-
-    let verbs = [
-      {
-        "verb": "pause",
-        "length": 7
-      }
-    ];
-    provisionCallHook(from, verbs);
-    //THEN
-    await p;
-
-    let obj = await getJSON(`http:127.0.0.1:3100/lastRequest/${from}_actionHook`)
-    t.ok(obj.body.type = 'amd_no_speech_detected',
-      'create-call: AMD detected');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
--- a/test/create-test-db.js
+++ b/test/create-test-db.js
@@ -2,14 +2,6 @@ const test = require('tape') ;
 const exec = require('child_process').exec ;
 const fs = require('fs');
 const {encrypt} = require('../lib/utils/encrypt-decrypt');
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  AWS_REGION,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-} = require('../lib/config');

 test('creating jambones_test database', (t) => {
  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/db/create_test_db.sql`, (err, stdout, stderr) => {
@@ -26,38 +18,30 @@ test('creating schema', (t) => {
    if (err) return t.end(err);
    t.pass('schema and test data successfully created');

-    const sql = [];
-    if (GCP_JSON_KEY) {
-      const google_credential = encrypt(GCP_JSON_KEY);
-      t.pass('adding google credentials');
-      sql.push(`UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';`);
-    }
-    if (AWS_ACCESS_KEY_ID && AWS_SECRET_ACCESS_KEY) {
+    if (process.env.GCP_JSON_KEY && process.env.AWS_ACCESS_KEY_ID && process.env.AWS_SECRET_ACCESS_KEY) {
+      const google_credential = encrypt(process.env.GCP_JSON_KEY);
      const aws_credential = encrypt(JSON.stringify({
-        access_key_id: AWS_ACCESS_KEY_ID,
-        secret_access_key: AWS_SECRET_ACCESS_KEY,
-        aws_region: AWS_REGION
+        access_key_id: process.env.AWS_ACCESS_KEY_ID,
+        secret_access_key: process.env.AWS_SECRET_ACCESS_KEY,
+        aws_region: process.env.AWS_REGION
      }));
-      t.pass('adding aws credentials');
-      sql.push(`UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';`);
-    }
-    if (MICROSOFT_REGION && MICROSOFT_API_KEY) {
      const microsoft_credential = encrypt(JSON.stringify({
-        region: MICROSOFT_REGION,
-        api_key: MICROSOFT_API_KEY
+        region: process.env.MICROSOFT_REGION || 'useast',
+        api_key: process.env.MICROSOFT_API_KEY || '1234567890'
      }));
-      t.pass('adding microsoft credentials');
-      sql.push(`UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';`);
-    }
-    if (sql.length > 0) {
+      const cmd = `
+UPDATE speech_credentials SET credential='${google_credential}' WHERE vendor='google';
+UPDATE speech_credentials SET credential='${aws_credential}' WHERE vendor='aws';
+UPDATE speech_credentials SET credential='${microsoft_credential}' WHERE vendor='microsoft';
+`;
      const path = `${__dirname}/.creds.sql`;
-      const cmd = sql.join('\n');
-      fs.writeFileSync(path, sql.join('\n'));
+      fs.writeFileSync(path, cmd);
      exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360  -D jambones_test < ${path}`, (err, stdout, stderr) => {
        console.log(stdout);
        console.log(stderr);
        if (err) return t.end(err);
        fs.unlinkSync(path)
+        fs.writeFileSync(`${__dirname}/credentials/gcp.json`, process.env.GCP_JSON_KEY);
        t.pass('set account-level speech credentials');
        t.end();
      });
--- a/test/dial-tests.js
+++ b/test/dial-tests.js
@@ -31,7 +31,6 @@ test('\'dial-phone\'', async(t) => {
      {
        "verb": "dial",
        "callerId": from,
-        "callerName": "test_callerName",
        "actionHook": "/actionHook",
        "timeLimit": 5,
        "target": [
@@ -57,7 +56,6 @@ test('\'dial-phone\'', async(t) => {
        "method": "POST",
      },
      "from": from,
-      "callerName": "Tom",
      "to": {
        "type": "phone",
        "number": "15583084808"
--- a/test/gather-tests.js
+++ b/test/gather-tests.js
@@ -4,15 +4,6 @@ const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,
-  AWS_SECRET_ACCESS_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-} = require('../lib/config');

 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -27,7 +18,7 @@ function connect(connectable) {
 }

 test('\'gather\' test - google', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -67,7 +58,7 @@ test('\'gather\' test - google', async(t) => {
 });

 test('\'gather\' test - default (google)', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -102,55 +93,8 @@ test('\'gather\' test - default (google)', async(t) => {
  }
 });

-test('\'config\' test - reset to app defaults', async(t) => {
-  if (!GCP_JSON_KEY) {
-    t.pass('skipping config tests');
-    return t.end();
-  }
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-    // GIVEN
-    let verbs = [
-      {
-        "verb": "config",
-        "recognizer": {
-          "vendor": "google",
-          "language": "fr-FR"
-        },
-      },
-      {
-        "verb": "config",
-        "reset": ['recognizer'],
-      },
-      {
-        "verb": "gather",
-        "input": ["speech"],
-        "timeout": 10,
-        "actionHook": "/actionHook"
-      }
-    ];
-    let from = "gather_success";
-    provisionCallHook(from, verbs);
-    // THEN
-    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
-    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase() === 'i\'d like to speak to customer support',
-      'config: resets recognizer to app defaults');
-
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
 test('\'gather\' test - microsoft', async(t) => {
-  if (!MICROSOFT_REGION || !MICROSOFT_API_KEY) {
+  if (!process.env.MICROSOFT_REGION || !process.env.MICROSOFT_API_KEY) {
    t.pass('skipping microsoft tests');
    return t.end();
  }
@@ -190,7 +134,7 @@ test('\'gather\' test - microsoft', async(t) => {
 });

 test('\'gather\' test - aws', async(t) => {
-  if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY) {
+  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
    t.pass('skipping aws tests');
    return t.end();
  }
@@ -230,7 +174,7 @@ test('\'gather\' test - aws', async(t) => {
 });

 test('\'gather\' test - deepgram', async(t) => {
-  if (!DEEPGRAM_API_KEY ) {
+  if (!process.env.DEEPGRAM_API_KEY ) {
    t.pass('skipping deepgram tests');
    return t.end();
  }
@@ -248,7 +192,7 @@ test('\'gather\' test - deepgram', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": DEEPGRAM_API_KEY
+            "apiKey": process.env.DEEPGRAM_API_KEY
          }
        },
        "timeout": 10,
@@ -261,7 +205,7 @@ test('\'gather\' test - deepgram', async(t) => {
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
    //console.log(JSON.stringify(obj));
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'gather: succeeds when using deepgram credentials');
    disconnect();
  } catch (err) {
@@ -272,7 +216,7 @@ test('\'gather\' test - deepgram', async(t) => {
 });

 test('\'gather\' test - soniox', async(t) => {
-  if (!SONIOX_API_KEY ) {
+  if (!process.env.SONIOX_API_KEY ) {
    t.pass('skipping soniox tests');
    return t.end();
  }
@@ -290,7 +234,7 @@ test('\'gather\' test - soniox', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": SONIOX_API_KEY
+            "apiKey": process.env.SONIOX_API_KEY
          }
        },
        "timeout": 10,
--- a/test/remove-test-db.js
+++ b/test/remove-test-db.js
@@ -5,6 +5,7 @@ test('dropping jambones_test database', (t) => {
  exec(`mysql -h 127.0.0.1 -u root --protocol=tcp --port=3360 < ${__dirname}/db/remove_test_db.sql`, (err, stdout, stderr) => {
    if (err) return t.end(err);
    t.pass('database successfully dropped');
+    fs.unlinkSync(`${__dirname}/credentials/gcp.json`);
    t.end();
  });
 });
--- a/test/say-tests.js
+++ b/test/say-tests.js
@@ -43,84 +43,3 @@ test('\'say\' tests', async(t) => {
    t.error(err);
  }
 });
-
-test('\'config\' reset synthesizer tests', async(t) => {
-  clearModule.all();
-  const {srf, disconnect} = require('../app');
-
-  try {
-    await connect(srf);
-
-    // GIVEN
-    const verbs = [
-      {
-        "verb": "config",
-        "synthesizer": {
-          "vendor": "microsft",
-          "voice": "foobar"
-        },
-      },
-      {
-        "verb": "config",
-        "reset": 'synthesizer',
-      },
-      {
-        verb: 'say',
-        text: 'hello'
-      }
-    ];
-
-    const from = 'say_test_success';
-    provisionCallHook(from, verbs)
-
-    // THEN
-    await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-    t.pass('say: succeeds when using using account credentials');
-    disconnect();
-  } catch (err) {
-    console.log(`error received: ${err}`);
-    disconnect();
-    t.error(err);
-  }
-});
-
-const {MICROSOFT_CUSTOM_API_KEY, MICROSOFT_DEPLOYMENT_ID, MICROSOFT_CUSTOM_REGION, MICROSOFT_CUSTOM_VOICE} = process.env;
-if (MICROSOFT_CUSTOM_API_KEY && MICROSOFT_DEPLOYMENT_ID && MICROSOFT_CUSTOM_REGION && MICROSOFT_CUSTOM_VOICE) {
-  test('\'say\' tests - microsoft custom voice', async(t) => {
-    clearModule.all();
-    const {srf, disconnect} = require('../app');
-
-    try {
-      await connect(srf);
-
-      // GIVEN
-      const verbs = [
-        {
-          verb: 'say',
-          text: 'hello',
-          synthesizer: {
-            vendor: 'microsoft',
-            voice: MICROSOFT_CUSTOM_VOICE,
-            options: {
-              deploymentId: MICROSOFT_DEPLOYMENT_ID,
-              apiKey: MICROSOFT_CUSTOM_API_KEY,
-              region: MICROSOFT_CUSTOM_REGION,
-            }
-          }
-        }
-      ];
-
-      const from = 'say_test_success';
-      provisionCallHook(from, verbs)
-
-      // THEN
-      await sippUac('uac-success-received-bye.xml', '172.38.0.10', from);
-      t.pass('say: succeeds when using microsoft custom voice');
-      disconnect();
-    } catch (err) {
-      console.log(`error received: ${err}`);
-      disconnect();
-      t.error(err);
-    }
-  });
-}
--- a/test/transcribe-tests.js
+++ b/test/transcribe-tests.js
@@ -4,15 +4,6 @@ const bent = require('bent');
 const getJSON = bent('json')
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  GCP_JSON_KEY,
-  AWS_ACCESS_KEY_ID,  
-  AWS_SECRET_ACCESS_KEY,
-  MICROSOFT_REGION,
-  MICROSOFT_API_KEY,
-  SONIOX_API_KEY,
-  DEEPGRAM_API_KEY,
-} = require('../lib/config');

 process.on('unhandledRejection', (reason, p) => {
  console.log('Unhandled Rejection at: Promise', p, 'reason:', reason);
@@ -27,7 +18,7 @@ function connect(connectable) {
 }

 test('\'transcribe\' test - google', async(t) => {
-  if (!GCP_JSON_KEY) {
+  if (!process.env.GCP_JSON_KEY) {
    t.pass('skipping google tests');
    return t.end();
  }
@@ -64,7 +55,7 @@ test('\'transcribe\' test - google', async(t) => {
 });

 test('\'transcribe\' test - microsoft', async(t) => {
-  if (!MICROSOFT_REGION || !MICROSOFT_API_KEY) {
+  if (!process.env.MICROSOFT_REGION || !process.env.MICROSOFT_API_KEY) {
    t.pass('skipping microsoft tests');
    return t.end();
  }
@@ -101,7 +92,7 @@ test('\'transcribe\' test - microsoft', async(t) => {
 });

 test('\'transcribe\' test - aws', async(t) => {
-  if (!AWS_ACCESS_KEY_ID || !AWS_SECRET_ACCESS_KEY) {
+  if (!process.env.AWS_ACCESS_KEY_ID || !process.env.AWS_SECRET_ACCESS_KEY) {
    t.pass('skipping aws tests');
    return t.end();
  }
@@ -138,7 +129,7 @@ test('\'transcribe\' test - aws', async(t) => {
 });

 test('\'transcribe\' test - deepgram', async(t) => {
-  if (!DEEPGRAM_API_KEY ) {
+  if (!process.env.DEEPGRAM_API_KEY ) {
    t.pass('skipping deepgram tests');
    return t.end();
  }
@@ -155,7 +146,7 @@ test('\'transcribe\' test - deepgram', async(t) => {
          "vendor": "deepgram",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": DEEPGRAM_API_KEY
+            "apiKey": process.env.DEEPGRAM_API_KEY
          }
        },
        "transcriptionHook": "/transcriptionHook"
@@ -166,7 +157,7 @@ test('\'transcribe\' test - deepgram', async(t) => {
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().includes('like to speak to customer support'),
+    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using deepgram credentials');

    disconnect();
@@ -178,7 +169,7 @@ test('\'transcribe\' test - deepgram', async(t) => {
 });

 test('\'transcribe\' test - soniox', async(t) => {
-  if (!SONIOX_API_KEY ) {
+  if (!process.env.SONIOX_API_KEY ) {
    t.pass('skipping soniox tests');
    return t.end();
  }
@@ -195,7 +186,7 @@ test('\'transcribe\' test - soniox', async(t) => {
          "vendor": "soniox",
          "hints": ["customer support", "sales", "human resources", "HR"],
          "deepgramOptions": {
-            "apiKey": SONIOX_API_KEY
+            "apiKey": process.env.SONIOX_API_KEY
          }
        },
        "transcriptionHook": "/transcriptionHook"
@@ -206,7 +197,7 @@ test('\'transcribe\' test - soniox', async(t) => {
    // THEN
    await sippUac('uac-gather-account-creds-success.xml', '172.38.0.10', from);
    let obj = await getJSON(`http://127.0.0.1:3100/lastRequest/${from}_actionHook`);
-    //console.log(JSON.stringify(obj));
+    console.log(JSON.stringify(obj));
    t.ok(obj.body.speech.alternatives[0].transcript.toLowerCase().startsWith('i\'d like to speak to customer support'),
      'transcribe: succeeds when using soniox credentials');

--- a/test/webhooks-tests.js
+++ b/test/webhooks-tests.js
@@ -2,17 +2,13 @@ const test = require('tape');
 const { sippUac } = require('./sipp')('test_fs');
 const clearModule = require('clear-module');
 const {provisionCallHook} = require('./utils')
-const {
-  JAMBONES_LOGLEVEL,
-  JAMBONES_TIME_SERIES_HOST
-} = require('../lib/config');
 const opts = {
  timestamp: () => {return `, "time": "${new Date().toISOString()}"`;},
-  level: JAMBONES_LOGLEVEL
+  level: process.env.JAMBONES_LOGLEVEL || 'info'
 };
 const logger = require('pino')(opts);
 const { queryAlerts } = require('@jambonz/time-series')(
-  logger, JAMBONES_TIME_SERIES_HOST
+  logger, process.env.JAMBONES_TIME_SERIES_HOST
 );

 process.on('unhandledRejection', (reason, p) => {
--- a/test/ws-requestor-unit-test.js
+++ b/test/ws-requestor-unit-test.js
@@ -3,10 +3,7 @@ const sinon = require('sinon');
 const proxyquire = require("proxyquire");
 proxyquire.noCallThru();
 const MockWebsocket = require('./ws-mock')
-const {
-  JAMBONES_LOGLEVEL,  
-} = require('../lib/config');
-const logger = require('pino')({level: JAMBONES_LOGLEVEL});
+const logger = require('pino')({level: process.env.JAMBONES_LOGLEVEL || 'error'});

 const BaseRequestor = proxyquire(
  "../lib/utils/base-requestor",
--- a/tracer.js
+++ b/tracer.js
@@ -7,16 +7,12 @@ const { BatchSpanProcessor } = require('@opentelemetry/sdk-trace-base');
 const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
 const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
 const  { OTLPTraceExporter } = require ('@opentelemetry/exporter-trace-otlp-http');
-const {
-  JAMBONES_OTEL_ENABLED,
-  OTEL_EXPORTER_JAEGER_AGENT_HOST,
-  OTEL_EXPORTER_JAEGER_ENDPOINT,
-  OTEL_EXPORTER_ZIPKIN_URL,
-  OTEL_EXPORTER_COLLECTOR_URL
-} = require('./lib/config');
+//const { HttpInstrumentation } = require('@opentelemetry/instrumentation-http');
+//const { ExpressInstrumentation } = require('@opentelemetry/instrumentation-express');
+//const { PinoInstrumentation } = require('@opentelemetry/instrumentation-pino');

 module.exports = (serviceName) => {
-  if (JAMBONES_OTEL_ENABLED) {
+  if (process.env.JAMBONES_OTEL_ENABLED) {
    const {version} = require('./package.json');
    const provider = new NodeTracerProvider({
      resource: new Resource({
@@ -26,15 +22,15 @@ module.exports = (serviceName) => {
    });

    let exporter;
-    if (OTEL_EXPORTER_JAEGER_AGENT_HOST  || OTEL_EXPORTER_JAEGER_ENDPOINT) {
+    if (process.env.OTEL_EXPORTER_JAEGER_AGENT_HOST  || process.env.OTEL_EXPORTER_JAEGER_ENDPOINT) {
      exporter = new JaegerExporter();
    }
-    else if (OTEL_EXPORTER_ZIPKIN_URL) {
-      exporter = new ZipkinExporter({url:OTEL_EXPORTER_ZIPKIN_URL});
+    else if (process.env.OTEL_EXPORTER_ZIPKIN_URL) {
+      exporter = new ZipkinExporter({url:process.env.OTEL_EXPORTER_ZIPKIN_URL});
    }
    else {
      exporter = new OTLPTraceExporter({
-        url: OTEL_EXPORTER_COLLECTOR_URL
+        url: process.OTEL_EXPORTER_COLLECTOR_URL
      });
    }