diff --git a/serverless.js b/serverless.js
index dd321d9..d8f8c8d 100644
--- a/serverless.js
+++ b/serverless.js
@@ -50,7 +50,7 @@ class AwsLambda extends Component {
 
     const config = mergeDeepRight(defaults, inputs)
 
-    config.name = this.state.name || this.context.resourceId()
+    config.name = inputs.name || this.state.name || this.context.resourceId()
 
     this.context.debug(
       `Starting deployment of lambda ${config.name} to the ${config.region} region.`
@@ -70,6 +70,7 @@ class AwsLambda extends Component {
 
       outputsAwsIamRole = await awsIamRole({
         service: 'lambda.amazonaws.com',
+        name: config.name,
         policy: {
           arn: 'arn:aws:iam::aws:policy/AdministratorAccess'
         },