diff --git a/packer/jambonz-mini/scripts/install_grafana.sh b/packer/jambonz-mini/scripts/install_grafana.sh
index 0dde8f6..7c5ff44 100644
--- a/packer/jambonz-mini/scripts/install_grafana.sh
+++ b/packer/jambonz-mini/scripts/install_grafana.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 if [ "$1" = "yes" ]; then 
 
-curl -sL https://packages.grafana.com/gpg.key | sudo apt-key add -
+curl -sL https://packages.grafana.com/gpg.key | sudo apt-key --keyring /etc/apt/trusted.gpg.d/grafana-apt-key.gpg add
 echo "deb https://packages.grafana.com/oss/deb stable main" | sudo tee /etc/apt/sources.list.d/grafana.list
 sudo apt-get update 
 sudo apt-get install -y grafana
diff --git a/packer/jambonz-mini/template.json b/packer/jambonz-mini/template.json
index 7429987..f1cf657 100644
--- a/packer/jambonz-mini/template.json
+++ b/packer/jambonz-mini/template.json
@@ -5,7 +5,7 @@
     "ami_description": "jambonz all-in-one AMI", 
     "instance_type": "t2.xlarge",
     "drachtio_version": "v0.8.20",
-    "jambonz_version": "v0.8.0-rc4",
+    "jambonz_version": "v0.7.9",
     "jambonz_user": "admin",
     "jambonz_password": "JambonzR0ck$",
     "install_telegraf": "yes",
diff --git a/packer/jambonz-monitoring/scripts/install_grafana.sh b/packer/jambonz-monitoring/scripts/install_grafana.sh
index 9d38e81..f92ac35 100644
--- a/packer/jambonz-monitoring/scripts/install_grafana.sh
+++ b/packer/jambonz-monitoring/scripts/install_grafana.sh
@@ -1,16 +1,17 @@
 #!/bin/bash
 if [ "$1" = "yes" ]; then 
 
-curl -sL https://packages.grafana.com/gpg.key | sudo apt-key add -
+curl -sL https://packages.grafana.com/gpg.key | sudo apt-key --keyring /etc/apt/trusted.gpg.d/grafana-apt-key.gpg add
 echo "deb https://packages.grafana.com/oss/deb stable main" | sudo tee /etc/apt/sources.list.d/grafana.list
 sudo apt-get update 
 sudo apt-get install -y grafana
+
 sudo mkdir /var/lib/grafana/dashboards
 sudo mv /tmp/grafana-dashboard-default.yaml /etc/grafana/provisioning/dashboards/default.yaml
 sudo mv /tmp/grafana-datasource.yml /etc/grafana/provisioning/datasources/datasource.yml
 
 sudo mv /tmp/grafana-dashboard-heplify.json /var/lib/grafana/dashboards
-sudo mv /tmp/grafana-dashboard-jambonz-cluster.json /var/lib/grafana/dashboards/grafana-dashboard-jambonz.json
+sudo mv /tmp/grafana-dashboard-jambonz-cluster.json /var/lib/grafana/dashboards
 sudo mv /tmp/grafana-dashboard-servers.json /var/lib/grafana/dashboards
 
 sudo chown -R grafana:grafana /var/lib/grafana/dashboards
diff --git a/packer/jambonz-monitoring/template.json b/packer/jambonz-monitoring/template.json
index f752721..6f072ed 100644
--- a/packer/jambonz-monitoring/template.json
+++ b/packer/jambonz-monitoring/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz monitoring server", 
     "instance_type": "t2.xlarge",
-    "jambonz_version": "v0.8.0-rc4",
+    "jambonz_version": "v0.7.9",
     "homer_user": "homer_user",
     "homer_password": "XcapJTqy11LnsYRtxXGPTYQkAnI",
     "install_influxdb":  "yes",
diff --git a/packer/jambonz-sbc-rtp/template.json b/packer/jambonz-sbc-rtp/template.json
index 733719d..8b62cac 100644
--- a/packer/jambonz-sbc-rtp/template.json
+++ b/packer/jambonz-sbc-rtp/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz SBC RTP server", 
     "drachtio_version": "v0.8.20",
-    "jambonz_version": "v0.8.0-rc4",
+    "jambonz_version": "v0.7.9",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "instance_type": "t3.xlarge",
diff --git a/packer/jambonz-sbc-sip/template.json b/packer/jambonz-sbc-sip/template.json
index cb83602..2863437 100644
--- a/packer/jambonz-sbc-sip/template.json
+++ b/packer/jambonz-sbc-sip/template.json
@@ -5,7 +5,7 @@
     "ami_description": "jambonz SBC SIP", 
     "instance_type": "t3.xlarge",
     "drachtio_version": "v0.8.20",
-    "jambonz_version": "v0.8.0-rc4",
+    "jambonz_version": "v0.7.9",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "install_datadog": "no",
diff --git a/packer/jambonz-web-server/template.json b/packer/jambonz-web-server/template.json
index 32997ea..3a7487b 100644
--- a/packer/jambonz-web-server/template.json
+++ b/packer/jambonz-web-server/template.json
@@ -4,7 +4,7 @@
     "ssh_username": "admin",
     "ami_description": "jambonz webserver", 
     "instance_type": "t3.xlarge",
-    "jambonz_version": "v0.8.0-rc4",
+    "jambonz_version": "v0.7.9",
     "ami_base_image_arch": "amd64",
     "ami_base_image_owner": "136693071363",
     "install_datadog": "no",