diff --git a/monkey/common/cloud/aws_service.py b/monkey/common/cloud/aws_service.py
index 4dbc8ff6a..93c3b609b 100644
--- a/monkey/common/cloud/aws_service.py
+++ b/monkey/common/cloud/aws_service.py
@@ -6,7 +6,7 @@ from botocore.exceptions import ClientError
 
 from common.cloud.aws_instance import AwsInstance
 
-__author__ = 'itay.mizeretz'
+__author__ = ['itay.mizeretz', 'shay.nehmad']
 
 INSTANCE_INFORMATION_LIST_KEY = 'InstanceInformationList'
 INSTANCE_ID_KEY = 'InstanceId'
diff --git a/monkey/common/cloud/test_filter_instance_data_from_aws_response.py b/monkey/common/cloud/test_filter_instance_data_from_aws_response.py
index 04e731f69..8aec518d3 100644
--- a/monkey/common/cloud/test_filter_instance_data_from_aws_response.py
+++ b/monkey/common/cloud/test_filter_instance_data_from_aws_response.py
@@ -4,6 +4,9 @@ from aws_service import filter_instance_data_from_aws_response
 import json
 
 
+__author__ = 'shay.nehmad'
+
+
 class TestFilter_instance_data_from_aws_response(TestCase):
     def test_filter_instance_data_from_aws_response(self):
         json_response_full = """