diff --git a/examples/debian11/main.tf b/examples/debian11/main.tf
index 01bf93b..30c07ba 100644
--- a/examples/debian11/main.tf
+++ b/examples/debian11/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2aa_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2aa_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/debian12/main.tf b/examples/debian12/main.tf
index cb2deb5..b5f55c8 100644
--- a/examples/debian12/main.tf
+++ b/examples/debian12/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2aa_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2aa_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/fedoracoreos/main.tf b/examples/fedoracoreos/main.tf
index 06d28c9..c9a188b 100644
--- a/examples/fedoracoreos/main.tf
+++ b/examples/fedoracoreos/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2aa_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2aa_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/rockylinux8/main.tf b/examples/rockylinux8/main.tf
index f474536..e60c087 100644
--- a/examples/rockylinux8/main.tf
+++ b/examples/rockylinux8/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2aa_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2aa_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/rockylinux9/main.tf b/examples/rockylinux9/main.tf
index dc95d2a..c1b514e 100644
--- a/examples/rockylinux9/main.tf
+++ b/examples/rockylinux9/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2aa_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2aa_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/sles15/main.tf b/examples/sles15/main.tf
index ca116b5..6dfcd2c 100644
--- a/examples/sles15/main.tf
+++ b/examples/sles15/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2a_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2a_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/ubuntu2204/main.tf b/examples/ubuntu2204/main.tf
index ef5ff7e..abb2dcc 100644
--- a/examples/ubuntu2204/main.tf
+++ b/examples/ubuntu2204/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2a_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2a_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/examples/ubuntu2404/main.tf b/examples/ubuntu2404/main.tf
index 868d92e..69f2617 100644
--- a/examples/ubuntu2404/main.tf
+++ b/examples/ubuntu2404/main.tf
@@ -5,7 +5,7 @@ locals {
   cloud_init_template_path = "${path.cwd}/cloud-init.yaml.tpl"
 }
 
-module "gcp-ampere-tau-t2a" {
+module "ampere-t2a" {
         source                   = "github.com/amperecomputing/terraform-gcp-ampere-tau-t2a"  
         project_id               = var.project_id
      #  Optional
@@ -22,9 +22,9 @@ module "gcp-ampere-tau-t2a" {
         cloud_init_template_file     = local.cloud_init_template_path
 }
 
-output "gcp_ampere_tau_t2a_private_ips" {
+output "ampere_t2a_private_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_private_ips
 }
-output "gcp_ampere_tau_t2a_public_ips" {
+output "ampere_t2a_public_ips" {
   value     = module.gcp-ampere-tau-t2a.ampere_taut2a_public_ips
 }
diff --git a/images.tf b/images.tf
index 07bc005..2e488fd 100644
--- a/images.tf
+++ b/images.tf
@@ -53,3 +53,16 @@ locals {
       }
    }
 }
+
+data "google_compute_image" fedora_coreos_stable {
+  family  = "fedora-coreos-stable-arm64"
+  project = "fedora-coreos-cloud" 
+}
+data "google_compute_image" fedora_coreos_testing {
+  family  = "fedora-coreos-testing-arm64"
+  project = "fedora-coreos-cloud" 
+}
+data "google_compute_image" fedora_coreos_next {
+  family  = "fedora-coreos-next-arm64"
+  project = "fedora-coreos-cloud" 
+}