diff --git a/install/healthchecks-install.sh b/install/healthchecks-install.sh
index e46959702..af832374b 100644
--- a/install/healthchecks-install.sh
+++ b/install/healthchecks-install.sh
@@ -35,7 +35,7 @@ PG_DB_NAME="healthchecks_db" PG_DB_USER="hc_user" PG_DB_PASS=$(openssl rand -bas
 
 msg_info "Setup Keys (Admin / Secret)"
 SECRET_KEY="$(openssl rand -base64 32 | tr -dc 'a-zA-Z0-9' | cut -c1-32)"
-ADMIN_EMAIL="admin@helper-scripts.local"
+ADMIN_EMAIL="admin@community-scripts.com"
 ADMIN_PASSWORD="$PG_DB_PASS"
 {
   echo "healthchecks Admin Email: $ADMIN_EMAIL"
diff --git a/install/nodebb-install.sh b/install/nodebb-install.sh
index 3823d59a0..0f0650907 100644
--- a/install/nodebb-install.sh
+++ b/install/nodebb-install.sh
@@ -91,16 +91,16 @@ expect "Format: mongodb://*" {
     send "$MONGO_CONNECTION_STRING\r"
 }
 expect "Administrator username" {
-    send "helper-scripts\r"
+    send "community-scripts\r"
 }
 expect "Administrator email address" {
-    send "helper-scripts@local.com\r"
+    send "admin@community-scripts.com\r"
 }
 expect "Password" {
-    send "helper-scripts\r"
+    send "community-scripts\r"
 }
 expect "Confirm Password" {
-    send "helper-scripts\r"
+    send "community-scripts\r"
 }
 expect eof
 EOF
diff --git a/tools/addon/all-templates.sh b/tools/addon/all-templates.sh
index f8d35619d..b23e98e00 100644
--- a/tools/addon/all-templates.sh
+++ b/tools/addon/all-templates.sh
@@ -116,7 +116,7 @@ fi
 PCT_OPTIONS="
     -features keyctl=1,nesting=1
     -hostname $NAME
-    -tags proxmox-helper-scripts
+    -tags community-script
     -onboot 0
     -cores 2
     -memory 2048
diff --git a/vm/opnsense-vm.sh b/vm/opnsense-vm.sh
index 81979c65a..463b010de 100644
--- a/vm/opnsense-vm.sh
+++ b/vm/opnsense-vm.sh
@@ -737,7 +737,7 @@ done
 
 msg_info "Creating a OPNsense VM"
 qm create $VMID -agent 1${MACHINE} -tablet 0 -localtime 1 -bios ovmf${CPU_TYPE} -cores $CORE_COUNT -memory $RAM_SIZE \
-  -name $HN -tags proxmox-helper-scripts -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
+  -name $HN -tags community-script -net0 virtio,bridge=$BRG,macaddr=$MAC$VLAN$MTU -onboot 1 -ostype l26 -scsihw virtio-scsi-pci
 pvesm alloc $STORAGE $VMID $DISK0 4M 1>&/dev/null
 qm importdisk $VMID ${FILE} $STORAGE ${DISK_IMPORT:-} 1>&/dev/null
 qm set $VMID \