diff --git a/aws-lab/instances.tf b/aws-lab/instances.tf
index e0fef5e..857939b 100644
--- a/aws-lab/instances.tf
+++ b/aws-lab/instances.tf
@@ -30,7 +30,7 @@ resource "aws_instance" "remnux" {
 
 resource "aws_instance" "guacamole" {
   count = var.enable_guacamole ? 1 : 0
-  ami   = var.guacamole-ami # bitnami guacamole 72d31fe1-c724-49d3-8981-a32cfbe0189e 
+  ami   = var.guacamole-ami #
 
   instance_type = "t2.medium"
 
@@ -67,12 +67,17 @@ resource "time_sleep" "wait_5_min" {
   create_duration = "5m"
 }
 
+# netCUBE's Guacamole instance uses default creds: 
+# username: guacadmin
+# password: [the instance ID]
+# so we don't need to retrieve the creds anymore
+
 # Get Guacamole credentials from get-console-output
-data "external" "guacamole_credentials" {
-  count   = var.enable_guacamole ? 1 : 0
-  program = ["bash", "get_password.sh"]
-  query = {
-    "instanceid" = data.aws_instance.guacamole_id[0].id
-  }
-  depends_on = [time_sleep.wait_5_min]
-}
+#data "external" "guacamole_credentials" {
+#  count   = var.enable_guacamole ? 1 : 0
+#  program = ["bash", "get_password.sh"]
+#  query = {
+#    "instanceid" = data.aws_instance.guacamole_id[0].id
+#  }
+#  depends_on = [time_sleep.wait_5_min]
+#}
diff --git a/aws-lab/outputs.tf b/aws-lab/outputs.tf
index 84c4bde..8a39c79 100644
--- a/aws-lab/outputs.tf
+++ b/aws-lab/outputs.tf
@@ -13,10 +13,10 @@ output "guacamole_public_ip" {
   value       = var.enable_guacamole == false ? null : aws_instance.guacamole[0].public_ip
 }
 
-output "guacamole_credentials" {
-  description = "Guacamole credentials"
-  value       = var.enable_guacamole == false ? null : data.external.guacamole_credentials[0].result
-}
+#output "guacamole_credentials" {
+#  description = "Guacamole credentials"
+#  value       = var.enable_guacamole == false ? null : data.external.guacamole_credentials[0].result
+#}
 
 output "flarevm_credentials" {
   description = "Default credentials for the PMAT FLARE-VM base AMI. PLEASE CHANGE THESE!"
@@ -27,3 +27,13 @@ output "remnux_credentials" {
   description = "Default credentials for the PMAT REMnux base AMI. PLEASE CHANGE THESE!"
   value = "remnux:malware"
 }
+
+output "guacamole_default_username" {
+  description = "Default netCUBE Guacamole server username"
+  value = "guacadmin" 
+}
+
+output "guacamole_default_password" {
+  description = "Instance ID of the Guacamole server, which is also the default password"
+  value = data.aws_instance.guacamole_id[0].id
+}