diff --git a/Gruntfile.coffee b/Gruntfile.coffee
index b15e45c6c..b930d253f 100644
--- a/Gruntfile.coffee
+++ b/Gruntfile.coffee
@@ -159,9 +159,9 @@ module.exports = (grunt)->
 
     grunt.registerTask 'default', ['clean', 'start']
 
-    grunt.registerTask 'deploy:prod', ['dist', 'script:deploy:prod']
+    grunt.registerTask 'deploy:prod', ['script:deploy:prod']
 
-    grunt.registerTask 'deploy:staging', ['dist', 'script:deploy:staging']
+    grunt.registerTask 'deploy:staging', ['script:deploy:staging']
 
     grunt.registerTask 'dist', ['build', 'uglify', 'copy:build_to_dist', 'compress']
 
@@ -171,6 +171,8 @@ module.exports = (grunt)->
 
     grunt.registerTask 'test', ['mochaTest']
 
+    grunt.registerTask 'upload', ['dist', 'script:s3_upload']
+
     # Code Tasks #######################################################################################################
 
     grunt.registerTask 'browserify:external', "Bundle 3rd-party libraries used in the app", ->
diff --git a/circle.yml b/circle.yml
index 7993b9897..8efca9612 100644
--- a/circle.yml
+++ b/circle.yml
@@ -1,12 +1,13 @@
 dependencies:
     pre:
         - gem install sass --version ">= 3.4"
+        - npm install -g grunt-cli
 deployment:
     staging:
-        branch: master
+        branch: staging
         commands:
-            - ./scripts/deploy --staging
+            - grunt deploy:staging
     production:
         branch: production
         commands:
-            - ./scripts/deploy --production
+            - grunt deploy:prod