diff --git a/README.md b/README.md
index f4506b41..92f982f9 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,14 @@ Go to [AWS account](http://aws.amazon.com/ec2/) and follow instructions
#### 2. Create IAM User
-Specify ```programmatic access``` during creation, and record credentials
-which will be used by Jenkins EC2 Fleet Plugin to connect to your Spot Fleet
-
+Specify ```programmatic access``` during creation, and record credentials
+which will be used by Jenkins EC2 Fleet Plugin to connect to your Spot Fleet.
+
+*Alternatively, this may use [AWS EC2 instance roles](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html)*
+
#### 3. Configure User permissions
-Add inline policy to the user to allow it use EC2 Spot Fleet and Auto Scaling Group
+Add inline policy to the user or instance role to allow it use EC2 Spot Fleet and Auto Scaling Group
[AWS documentation about that](https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/spot-fleet-requests.html#spot-fleet-prerequisites)
```json
@@ -118,17 +120,18 @@ https://docs.aws.amazon.com/autoscaling/ec2/userguide/GettingStartedTutorial.htm
Once the fleet is launched, you can set it up by adding a new **EC2 Fleet** cloud in the Jenkins
-1. Goto ```Manage Jenkins > Plugin Manager```
+1. Goto ```Manage Jenkins > Plugin Manager```
1. Install ```EC2 Fleet Jenkins Plugin```
1. Goto ```Manage Jenkins > Configure System```
1. Click ```Add a new cloud``` and select ```Amazon EC2 Fleet```
-1. Configure credentials and specify EC2 Spot Fleet or Auto Scaling Group which you want to use
+1. Configure AWS credentials, or alternatively leave empty to use the EC2 instance role
+1. Specify EC2 Spot Fleet or Auto Scaling Group which you want to use
## Scaling
You can specify the scaling limits in your cloud settings. By default, Jenkins will try to scale fleet up
if there are enough tasks waiting in the build queue and scale down idle nodes after a specified idleness period.
-You can use the History tab in the AWS console to view the scaling history.
+You can use the History tab in the AWS console to view the scaling history.
## Groovy
diff --git a/docs/CONFIGURATION-AS-CODE.md b/docs/CONFIGURATION-AS-CODE.md
index 58ba3a54..de1b81aa 100644
--- a/docs/CONFIGURATION-AS-CODE.md
+++ b/docs/CONFIGURATION-AS-CODE.md
@@ -11,7 +11,7 @@
| Property | Type | Required | Description |
|-------------------|---|---|---|
| name |string|yes|ec2-fleet|
-| awsCredentialsId |string|yes||
+| awsCredentialsId |string|no, default ```null```|[Leave blank to use AWS EC2 instance role](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html)|
| computerConnector |object|yes|for example ```sshConnector```|
| region |string|yes|```us-east-2```, full [list](https://docs.aws.amazon.com/AmazonRDS/latest/UserGuide/Concepts.RegionsAndAvailabilityZones.html)|
| fleet |string|yes|my-fleet|
@@ -48,11 +48,10 @@ jenkins:
clouds:
- ec2Fleet:
name: ec2-fleet
- awsCredentialsId: xx
computerConnector:
ssh:
credentialsId: cred
- sshHostKeyVerificationStrategy:
+ sshHostKeyVerificationStrategy:
NonVerifyingKeyVerificationStrategy
region: us-east-2
fleet: my-fleet
@@ -90,4 +89,4 @@ jenkins:
cloudStatusIntervalSec: 11
disableTaskResubmit: true
noDelayProvision: true
-```
\ No newline at end of file
+```
diff --git a/docs/LABEL-BASED-CONFIGURATION.md b/docs/LABEL-BASED-CONFIGURATION.md
index 6507defc..40da52a6 100644
--- a/docs/LABEL-BASED-CONFIGURATION.md
+++ b/docs/LABEL-BASED-CONFIGURATION.md
@@ -52,7 +52,7 @@ Minimum configuration just Image ID
# Configuration
-1. Create AWS User
+1. Create AWS User. _Alternatively, you can use an [AWS EC2 instance role](https://docs.aws.amazon.com/IAM/latest/UserGuide/id_roles_use_switch-role-ec2.html)_
1. Add Inline User Permissions
```json
{
diff --git a/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetCloud/config.jelly b/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetCloud/config.jelly
index 09f391ce..92449897 100644
--- a/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetCloud/config.jelly
+++ b/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetCloud/config.jelly
@@ -14,6 +14,7 @@
+ Select AWS Credentials or leave set to none to use AWS EC2 Instance Role
diff --git a/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetLabelCloud/config.jelly b/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetLabelCloud/config.jelly
index e1d64aba..b2b90899 100644
--- a/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetLabelCloud/config.jelly
+++ b/src/main/resources/com/amazon/jenkins/ec2fleet/EC2FleetLabelCloud/config.jelly
@@ -14,6 +14,7 @@
+ Select AWS Credentials or leave set to none to use AWS EC2 Instance Role