diff --git a/serverless-resources.yml b/serverless-resources.yml
index 420511e..bd43eea 100644
--- a/serverless-resources.yml
+++ b/serverless-resources.yml
@@ -71,13 +71,13 @@ rBuildsEcsTaskIamRole:
               Action:
                 - s3:*
               Resource:
-                - arn:aws:s3:::${self:custom.s3Bucket}
-                - arn:aws:s3:::${self:custom.s3Bucket}/*
+                - arn:aws:s3:::${self:custom.${self:provider.stage}.s3Bucket}
+                - arn:aws:s3:::${self:custom.${self:provider.stage}.s3Bucket}/*
 
 rBuildsEcsLaunchTemplate:
   Type: AWS::EC2::LaunchTemplate
   Properties:
-    LaunchTemplateName: r-builds-batch-managed-ecs-larger-volume
+    LaunchTemplateName: r-builds-${self:provider.stage}-batch-managed-ecs-larger-volume
     LaunchTemplateData:
       BlockDeviceMappings:
         - DeviceName: /dev/xvdcz
diff --git a/serverless.yml b/serverless.yml
index 524d1e9..7be1663 100644
--- a/serverless.yml
+++ b/serverless.yml
@@ -29,10 +29,10 @@ provider:
        Action:
          - "s3:*"
        Resource:
-        - arn:aws:s3:::${self:custom.s3Bucket}
-        - arn:aws:s3:::${self:custom.s3Bucket}/*
+        - arn:aws:s3:::${self:custom.${self:provider.stage}.s3Bucket}
+        - arn:aws:s3:::${self:custom.${self:provider.stage}.s3Bucket}/*
   environment:
-    S3_BUCKET: ${self:custom.s3Bucket}
+    S3_BUCKET: ${self:custom.${self:provider.stage}.s3Bucket}
     JOB_QUEUE_ARN:
       Ref: rBuildsBatchJobQueue
     JOB_DEFINITION_ARN_ubuntu_1604: