diff --git a/cloudformation/jambonz-mini.yaml b/cloudformation/jambonz-mini.yaml
index 3efdd2c..bbb65ab 100644
--- a/cloudformation/jambonz-mini.yaml
+++ b/cloudformation/jambonz-mini.yaml
@@ -77,16 +77,8 @@ Parameters:
       - 150
   URLPortal:
     Type: String
-    Description: "(Optional) A DNS name that you will point to the jambonz webserver(s)"
+    Description: "(Optional) A DNS name for the server (note: you must add a DNS A record in your DNS provider)"
     Default: ""
-  JaegerUsername:
-      Type: String
-      Description: "Basic Auth username for Jaeger"
-      Default: "admin"
-  JaegerPassword:
-    Type: String
-    Description: "Basic Auth password for Jaeger"
-    NoEcho: true
 
 Conditions:
   ShouldEnableCloudWatch: !Equals
@@ -103,7 +95,7 @@ Conditions:
 Mappings:
   AWSRegion2AMI:
     us-east-1:
-      Ami: ami-073145caea65140ae
+      Ami: ami-0f9dfdc534e6cd1dc
 
 Resources:
   IamCloudwatchRole:
@@ -206,9 +198,6 @@ Resources:
               # reset the database
               JAMBONES_ADMIN_INITIAL_PASSWORD=$INSTANCE_ID JAMBONES_MYSQL_USER=admin JAMBONES_MYSQL_PASSWORD=$NEW_DB_PASSWD JAMBONES_MYSQL_DATABASE=jambones JAMBONES_MYSQL_HOST=localhost /home/admin/apps/jambonz-api-server/db/reset_admin_password.js
 
-              #Add BasicAuth password for Jaeger
-              sudo htpasswd -b -c /etc/nginx/.htpasswd ${JaegerUsername} "${JaegerPassword}"
-              
               # configure webapp
               if [[ -z "${URLPortal}" ]]; then
                 # portals will be accessed by IP address of server
@@ -220,6 +209,8 @@ Resources:
                 echo "VITE_API_BASE_URL=http://${URLPortal}/api/v1" > /home/admin/apps/jambonz-webapp/.env 
                 API_BASE_URL=http://${URLPortal}/api/v1 TAG="<script>window.JAMBONZ = { API_BASE_URL: '$API_BASE_URL'};</script>"
                 sed -i -e "\@</head>@i\ $TAG" /home/admin/apps/jambonz-webapp/dist/index.html
+                # add row to system information table 
+                mysql -h localhost -u admin -D jambones -p$NEW_DB_PASSWD -e $'insert into system_information (domain_name, sip_domain_name, monitoring_domain_name) values ('\'''"${URLPortal}"''\'', '\''sip.'"${URLPortal}"''\'', '\''grafana.'"${URLPortal}"''\'')'
               
                 sudo cat << EOF > /etc/nginx/sites-available/default 
                 server {
@@ -267,20 +258,6 @@ Resources:
                     proxy_cache_bypass \$http_upgrade;
                   }
                 }
-                server {
-                  listen 80;
-                  server_name jaeger.${URLPortal}; 
-                  location / {
-                    proxy_pass http://localhost:16686; 
-                    proxy_http_version 1.1;
-                    proxy_set_header Upgrade \$http_upgrade;
-                    proxy_set_header Connection 'upgrade';
-                    proxy_set_header Host \$host;
-                    proxy_cache_bypass \$http_upgrade;
-                    auth_basic "Secured Endpoint";
-                    auth_basic_user_file /etc/nginx/.htpasswd;
-                  }
-                }
               EOF
               
                 sudo systemctl restart nginx
@@ -310,8 +287,6 @@ Resources:
             - URLPortal: !Ref URLPortal
               Cloudwatch: !Ref Cloudwatch
               CloudwatchLogRetention: !Ref CloudwatchLogRetention
-              JaegerUsername: !Ref JaegerUsername
-              JaegerPassword: !Ref JaegerPassword
 
   jambonzSecurityGroup:
     Type: 'AWS::EC2::SecurityGroup'
@@ -458,13 +433,6 @@ Outputs:
         - !Ref URLPortal
     Description: URL for the grafana portal
     Condition: CreateDNS
-  JaegerURL:
-    Value: !Join 
-      - ''
-      - - 'http://jaeger.'
-        - !Ref URLPortal
-    Description: URL for the jaeger portal
-    Condition: CreateDNS
   HomerURL:
     Value: !Join 
       - ''
@@ -477,7 +445,6 @@ Outputs:
       - jambonzInstance
       - PublicIp
     Description: Server IP address - create a DNS record for this domain as well as subdomains grafana, homer, and jaeger
-    Condition: CreateDNS
   User:
     Value: admin
     Description: Login username for the jambonz portal
diff --git a/cloudformation/jambonz-scalable-production-arm64.yaml b/cloudformation/jambonz-scalable-production-arm64.yaml
index 405c5f5..1a5ec9f 100644
--- a/cloudformation/jambonz-scalable-production-arm64.yaml
+++ b/cloudformation/jambonz-scalable-production-arm64.yaml
@@ -1589,6 +1589,9 @@ Resources:
                 mysql -h ${JAMBONES_MYSQL_HOST} -u admin -D jambones -p${JAMBONES_MYSQL_PASSWORD} < /home/admin/apps/jambonz-api-server/db/jambones-sql.sql
                 mysql -h ${JAMBONES_MYSQL_HOST} -u admin -D jambones -p${JAMBONES_MYSQL_PASSWORD} < /home/admin/apps/jambonz-api-server/db/seed-production-database-open-source.sql
                 JAMBONES_MYSQL_HOST=${JAMBONES_MYSQL_HOST} JAMBONES_MYSQL_USER=admin JAMBONES_MYSQL_PASSWORD=${JAMBONES_MYSQL_PASSWORD} JAMBONES_MYSQL_DATABASE=jambones /home/admin/apps/jambonz-api-server/db/reset_admin_password.js
+
+                # add row to system information table 
+                mysql -h localhost -u admin -D jambones -p$NEW_DB_PASSWD -e $'insert into system_information (domain_name, sip_domain_name, monitoring_domain_name) values ('\'''"${URLPortal}"''\'', '\''sip.'"${URLPortal}"''\'', '\''grafana.'"${URLPortal}"''\'')'
               fi
               # jambonz webapp
               echo "building webapp.."
@@ -1637,6 +1640,7 @@ Resources:
                     STATS_TELEGRAF: 1,
                     STATS_SAMPLE_RATE: ${JAMBONES_SAMPLE_RATE},
                     HTTP_PORT:  3000,
+                    JAEGER_BASE_URL: 'http://${MONITORING_SERVER_IP}::16686',
                     HOMER_BASE_URL: 'http://${MONITORING_SERVER_IP}:9080',
                     HOMER_USERNAME: 'admin',
                     HOMER_PASSWORD: 'sipcapture',
diff --git a/cloudformation/jambonz-scalable-production-no-database.yaml b/cloudformation/jambonz-scalable-production-no-database.yaml
index 37e42a0..4716781 100644
--- a/cloudformation/jambonz-scalable-production-no-database.yaml
+++ b/cloudformation/jambonz-scalable-production-no-database.yaml
@@ -1483,6 +1483,10 @@ Resources:
                     STATS_PORT: 8125,
                     STATS_PROTOCOL: 'tcp',
                     STATS_TELEGRAF: 1,
+                    JAEGER_BASE_URL: 'http://${MONITORING_SERVER_IP}::16686',
+                    HOMER_BASE_URL: 'http://${MONITORING_SERVER_IP}:9080',
+                    HOMER_USERNAME: 'admin',
+                    HOMER_PASSWORD: 'sipcapture',
                     HTTP_PORT:  3000,
                     JWT_SECRET: '${JWT_SECRET}'
                     },
diff --git a/cloudformation/jambonz-scalable-production.yaml b/cloudformation/jambonz-scalable-production.yaml
index f5bc0a4..6927fef 100644
--- a/cloudformation/jambonz-scalable-production.yaml
+++ b/cloudformation/jambonz-scalable-production.yaml
@@ -260,14 +260,6 @@ Parameters:
     Type: String
     Description: "DNS name you will point to the jambonz webserver(s)"
     Default: "yourdomain.com"
-  JaegerUsername:
-    Type: String
-    Description: "Basic Auth username for Jaeger"
-    Default: "admin"
-  JaegerPassword:
-    Type: String
-    Description: "Basic Auth password for Jaeger"
-    Default: "JambonzR0ck$"
   StatsSampleRate: 
     Type: Number
     Description: sampling rate for metrics, a number between 0 and 1 inclusive
@@ -1751,7 +1743,11 @@ Resources:
                 mysql -h ${JAMBONES_MYSQL_HOST} -u admin -D jambones -p${JAMBONES_MYSQL_PASSWORD} < /home/admin/apps/jambonz-api-server/db/jambones-sql.sql
                 mysql -h ${JAMBONES_MYSQL_HOST} -u admin -D jambones -p${JAMBONES_MYSQL_PASSWORD} < /home/admin/apps/jambonz-api-server/db/seed-production-database-open-source.sql
                 JAMBONES_MYSQL_HOST=${JAMBONES_MYSQL_HOST} JAMBONES_MYSQL_USER=admin JAMBONES_MYSQL_PASSWORD=${JAMBONES_MYSQL_PASSWORD} JAMBONES_MYSQL_DATABASE=jambones /home/admin/apps/jambonz-api-server/db/reset_admin_password.js
+
+                # add row to system information table 
+                mysql -h localhost -u admin -D jambones -p$NEW_DB_PASSWD -e $'insert into system_information (domain_name, sip_domain_name, monitoring_domain_name) values ('\'''"${URLPortal}"''\'', '\''sip.'"${URLPortal}"''\'', '\''grafana.'"${URLPortal}"''\'')'
               fi
+
               # jambonz webapp
               echo "configuring webapp.."
               echo "VITE_API_BASE_URL=http://${URLPortal}/api/v1" > /home/admin/apps/jambonz-webapp/.env 
@@ -1797,6 +1793,7 @@ Resources:
                     STATS_TELEGRAF: 1,
                     STATS_SAMPLE_RATE: ${JAMBONES_SAMPLE_RATE},
                     HTTP_PORT:  3000,
+                    JAEGER_BASE_URL: 'http://${MONITORING_SERVER_IP}::16686',
                     HOMER_BASE_URL: 'http://${MONITORING_SERVER_IP}:9080',
                     HOMER_USERNAME: 'admin',
                     HOMER_PASSWORD: 'sipcapture',
@@ -1845,12 +1842,7 @@ Resources:
               # configure telegraph to send to the monitoring server
               sudo sed -i -e "s/influxdb:8086/${MONITORING_SERVER_IP}:8086/g"  /etc/telegraf/telegraf.conf
               sudo systemctl restart telegraf
-            
-              # configure nginx for homer and grafana on the monitoring server
-              
-              #Add BasicAuth password for Jaeger
-              sudo htpasswd -b -c /etc/nginx/.htpasswd ${JaegerUsername} "${JaegerPassword}"
-              
+                                        
               sudo cat << EOF > /etc/nginx/sites-available/default 
               server {
                   listen 80;
@@ -1938,8 +1930,6 @@ Resources:
               JAMBONES_TIME_SERIES_HOST: !GetAtt MonitoringServerEC2.PrivateIp
               JWT_SECRET: !Ref EncryptionSecret
               URLPortal: !Ref URLPortal
-              JaegerUsername: !Ref JaegerUsername
-              JaegerPassword: !Ref JaegerPassword
               CloudwatchLogRetention: !Ref CloudwatchLogRetention
               DbCachingTTS: !Ref DbCachingTTS
 
diff --git a/packer/jambonz-mini/files/ecosystem.config.js b/packer/jambonz-mini/files/ecosystem.config.js
index 23999ab..275f5bd 100644
--- a/packer/jambonz-mini/files/ecosystem.config.js
+++ b/packer/jambonz-mini/files/ecosystem.config.js
@@ -66,6 +66,7 @@ module.exports = {
       STATS_PROTOCOL: 'tcp',
       STATS_TELEGRAF: 1,
       HTTP_PORT:  3002,
+      JAEGER_BASE_URL: 'http://127.0.0.1:16686',
       HOMER_BASE_URL: 'http://127.0.0.1:9080',
       HOMER_USERNAME: 'admin',
       HOMER_PASSWORD: 'sipcapture'