diff --git a/monkey/monkey_island/cc/resources/telemetry.py b/monkey/monkey_island/cc/resources/telemetry.py
index 6fc8f06f8..ab911a119 100644
--- a/monkey/monkey_island/cc/resources/telemetry.py
+++ b/monkey/monkey_island/cc/resources/telemetry.py
@@ -192,7 +192,7 @@ class Telemetry(flask_restful.Resource):
             wmi_handler = WMIHandler(monkey_id, telemetry_json['data']['wmi'], users_secrets)
             wmi_handler.process_and_handle_wmi_info()
         if 'aws' in telemetry_json['data']:
-            mongo.db.monkey.insert({'aws_instance_id': telemetry_json['data']['instance-id']})
+            mongo.db.monkey.update_one({'_id': monkey_id}, {'aws_instance_id': telemetry_json['data']['instance-id']})
 
     @staticmethod
     def add_ip_to_ssh_keys(ip, ssh_info):
diff --git a/monkey/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py
index b5ef28f65..52bafa36f 100644
--- a/monkey/monkey_island/cc/services/config.py
+++ b/monkey/monkey_island/cc/services/config.py
@@ -645,10 +645,10 @@ SCHEMA = {
                     'type': 'object',
                     'description': 'These credentials will be used in order to export the monkey\'s findings to the AWS Security Hub.',
                     'properties': {
-                        'iam_role_id': {
-                            'title': 'IAM role ID',
+                        'aws_account_id': {
+                            'title': 'AWS account ID',
                             'type': 'string',
-                            'description': ''
+                            'description': 'Your AWS account ID that is subscribed to security hub feeds'
                         },
                         'aws_access_key_id': {
                             'title': 'AWS access key ID',
diff --git a/monkey/monkey_island/cc/services/report.py b/monkey/monkey_island/cc/services/report.py
index a75fdb7dd..a002235a0 100644
--- a/monkey/monkey_island/cc/services/report.py
+++ b/monkey/monkey_island/cc/services/report.py
@@ -553,7 +553,7 @@ class ReportService:
 
     @staticmethod
     def get_machine_aws_instance_id(hostname):
-        return str(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1}))
+        return str(list(mongo.db.monkey.find({'hostname': hostname}, {'aws_instance_id': 1}))[0]['aws_instance_id'])
 
     @staticmethod
     def get_issues():
@@ -754,7 +754,7 @@ class ReportService:
     def get_active_exporters():
         # This function should be in another module in charge of building a list of active exporters
         exporters_list = []
-        if load_env_from_file() == AWS:
+        if str(load_env_from_file()) == 'standard':
             exporters_list.append(AWSExporter)
         return exporters_list