diff --git a/serverless-resources.yml b/serverless-resources.yml
index 0b549b0..1a17d7b 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -87,7 +87,7 @@ rBuildsBatchComputeEnvironment:
       SecurityGroupIds: ${self:custom.securityGroupIds}
       Subnets: ${self:custom.subnets}
       Type: SPOT
-      BidPercentage: 40
+      BidPercentage: 60
       InstanceRole:
         "Fn::GetAtt": [ rBuildsIamInstanceProfile, Arn ]
       InstanceTypes:
@@ -231,6 +231,7 @@ rBuildsEventRule:
   Properties:
     Description: Check for New R Versions
     ScheduleExpression: rate(1 hour)
+    State: ${self:custom.${self:provider.stage}.eventRuleState}
     Targets:
       - Id: rbuilds
         Input: '{}'
diff --git a/serverless.yml b/serverless.yml
index 2cdcc55..524d1e9 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -7,17 +7,19 @@ plugins:
 custom: ${file(./serverless-custom.yml)}
 
 package:
- exclude:
-   - integration/**
-   - builder/**
-   - docs/**
+  exclude:
+    - integration/**
+    - builder/**
+    - docs/**
+    - node_modules/**
 
 provider:
   name: aws
   runtime: python3.6
+  stage: ${opt:stage, self:custom.defaultStage}
   deploymentBucket:
     name: ${self:custom.deploymentBucket}
-  stackTags: ${self:custom.stackTags}
+  stackTags: ${self:custom.${self:provider.stage}.stackTags}
   iamRoleStatements:
     -  Effect: Allow
        Action: