diff --git a/attack_range.py b/attack_range.py
index a44e60a53..0a721a4ae 100644
--- a/attack_range.py
+++ b/attack_range.py
@@ -55,9 +55,11 @@ def init(args):
 
     if config["general"]["cloud_provider"] == "aws":
         config.pop("azure")
+        config.pop("gcp")
         controller = AwsController(config)
     elif config["general"]["cloud_provider"] == "azure":
         config.pop("aws")
+        config.pop("gcp")
         controller = AzureController(config)
     elif config["general"]["cloud_provider"] == "gcp":
         config.pop("aws")
diff --git a/modules/aws_controller.py b/modules/aws_controller.py
index a97556093..8de00247d 100644
--- a/modules/aws_controller.py
+++ b/modules/aws_controller.py
@@ -325,6 +325,17 @@ def show(self) -> None:
                         + "\n\tusername: ubuntu \n\tpassword: "
                         + self.config["general"]["attack_range_password"]
                     )
+                elif instance_name.startswith("ar-caldera"):
+                    messages.append(
+                        "\nAccess Caldera via:\n\tWeb > http://"
+                        + instance["NetworkInterfaces"][0]["Association"]["PublicIp"]
+                        + ":8888\n\tSSH > ssh -i"
+                        + self.config["aws"]["private_key_path"]
+                        + " admin@"
+                        + instance["NetworkInterfaces"][0]["Association"]["PublicIp"]
+                        + "\n\tusername: admin \n\tpassword: "
+                        + self.config["general"]["attack_range_password"]
+                    )
             else:
                 response.append(
                     [instance["Tags"][0]["Value"], instance["State"]["Name"]]
diff --git a/modules/config_handler.py b/modules/config_handler.py
index 05176c247..7b590c48c 100644
--- a/modules/config_handler.py
+++ b/modules/config_handler.py
@@ -30,6 +30,7 @@ def read_config(self, config_path: str) -> dict:
             "simulation",
             "zeek_server",
             "snort_server",
+            "caldera_server",
         ]
 
         for parent_key in parent_keys: