diff --git a/action/base-setup.yml b/action/base-setup.yml
index 945a8089..8d553d0f 100644
--- a/action/base-setup.yml
+++ b/action/base-setup.yml
@@ -232,9 +232,9 @@ Resources:
             - Effect: Allow
               Action:
                 # Allow upload to S3
-                - s3:GetObject
-                - s3:GetObjectVersion
-                - s3:PutObject
+                - 's3:GetObject'
+                - 's3:GetObjectVersion'
+                - 's3:PutObject'
 
                 # Allow the use of secret manager
                 - 'secretsmanager:GetSecretValue'
diff --git a/action/task-def-formation.yml b/action/task-def-formation.yml
index fa944150..85959085 100644
--- a/action/task-def-formation.yml
+++ b/action/task-def-formation.yml
@@ -151,6 +151,16 @@ Resources:
     Properties: 
       Name: !Join [ "", [ 'AndroidKeyAliasPass', !Ref BUILDID ] ]
       SecretString: !Ref AndroidKeyAliasPass
+  AWSAccessKeyIDSecret:
+    Type: AWS::SecretsManager::Secret
+    Properties: 
+      Name: !Join [ "", [ 'AWSAccessKeyID', !Ref BUILDID ] ]
+      SecretString: !Ref AWSAccessKeyID
+  AWSSecretAccessKey:
+    Type: AWS::SecretsManager::Secret
+    Properties: 
+      Name: !Join [ "", [ 'AWSSecretAccessKey', !Ref BUILDID ] ]
+      SecretString: !Ref AWSSecretAccessKey
   
   TaskDefinition:
     Type: 'AWS::ECS::TaskDefinition'