diff --git a/scripts/e2e/e2e-publish.js b/scripts/e2e/e2e-publish.js
index 9275c8db5f..d71b6a94b6 100644
--- a/scripts/e2e/e2e-publish.js
+++ b/scripts/e2e/e2e-publish.js
@@ -76,6 +76,7 @@ module.exports = function(options) {
     );
   }
 
+  console.log('Upload e2e tests');
   uploadFiles(inputDir, '');
 };
 
diff --git a/scripts/snapshot/protractor.config.js b/scripts/snapshot/protractor.config.js
index fdd50d88f1..a515641368 100644
--- a/scripts/snapshot/protractor.config.js
+++ b/scripts/snapshot/protractor.config.js
@@ -21,12 +21,9 @@ exports.config = {
   baseUrl: 'http://localhost:' + buildConfig.protractorPort,
 
   onPrepare: function() {
-    var ionicSnapshot = require('./ionic.snapshot.js');
-    ionicSnapshot({
-      groupId: 'ionic2',
-      appId: 'snapshots',
-      accessKey: process.env.IONIC_SNAPSHOT_KEY
-    });
+    var snapshotConfig = require('./snapshot.config').config;
+    var ionicSnapshot = require('./ionic.snapshot');
+    ionicSnapshot(snapshotConfig);
   }
 
 };
diff --git a/scripts/snapshot/snapshot.config.js b/scripts/snapshot/snapshot.config.js
new file mode 100644
index 0000000000..f7c244d8b7
--- /dev/null
+++ b/scripts/snapshot/snapshot.config.js
@@ -0,0 +1,10 @@
+
+exports.config = {
+
+  groupId: 'ionic2',
+  appId: 'snapshots',
+  //domain: 'http://localhost:8080',
+  domain: 'http://ionic-snapshot-go.appspot.com',
+  accessKey: process.env.IONIC_SNAPSHOT_KEY
+
+};
diff --git a/scripts/snapshot/snapshot.task.js b/scripts/snapshot/snapshot.task.js
index 9e48a1dfe2..a995f85e2e 100644
--- a/scripts/snapshot/snapshot.task.js
+++ b/scripts/snapshot/snapshot.task.js
@@ -19,18 +19,8 @@ module.exports = function(gulp, argv, buildConfig) {
   });
 
   gulp.task('snapshot', ['e2e', 'protractor-server'], function(done) {
-    var configFile = path.resolve(projectRoot, 'scripts/snapshot/protractor.config.js');
-    snapshot(done, configFile);
-  });
-
-  gulp.task('e2e-publish', function(done) {
-    var e2ePublish = require('../e2e/e2e-publish');
-    e2ePublish({
-      domain: 'http://ionic-snapshot-go.appspot.com',
-      groupId: 'ionic2',
-      appId: 'snapshot',
-      testId: uuid.v4()
-    });
+    var protractorConfigFile = path.resolve(projectRoot, 'scripts/snapshot/protractor.config.js');
+    snapshot(done, protractorConfigFile);
   });
 
   var snapshotValues = _.merge({
@@ -46,7 +36,7 @@ module.exports = function(gulp, argv, buildConfig) {
     }
   }, argv);
 
-  function snapshot(done, configFile) {
+  function snapshot(done, protractorConfigFile) {
     var protractorArgs = [
       '--browser <%= browser %>',
       '--platform <%= platform %>',
@@ -60,7 +50,9 @@ module.exports = function(gulp, argv, buildConfig) {
       return _.template(argument, snapshotValues);
     });
 
-    return protractor(done, [configFile].concat(protractorArgs));
+    e2ePublish(snapshotValues.params.test_id);
+
+    return protractor(done, [protractorConfigFile].concat(protractorArgs));
   }
 
   function protractor(done, args) {
@@ -82,4 +74,12 @@ module.exports = function(gulp, argv, buildConfig) {
       finish();
     });
   }
+
+  function e2ePublish(testId) {
+    var snapshotConfig = require('./snapshot.config').config;
+    snapshotConfig.testId = testId;
+
+    require('../e2e/e2e-publish')(snapshotConfig);
+  }
+
 };