diff --git a/.travis.yml b/.travis.yml
index fb64a8acb..8ed10531d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,11 @@ cache:
   - node_modules
 notifications:
   email: false
-git:
-  submodules: false
+before_install:
+  - echo "https://${GH_TOKEN}:@github.com" > .git/credentials
+  - git config credential.helper "store --file=.git/credentials"
+  - git config --global user.email "bot@formbuilder.online"
+  - "git config --global user.name \"\U0001F916\""
 jobs:
   include:
   - stage: lint
@@ -23,10 +26,6 @@ jobs:
   - stage: deploy
     if: branch = master
     before_deploy:
-    - echo "https://${GH_TOKEN}:@github.com" > .git/credentials
-    - git config credential.helper "store --file=.git/credentials"
-    - git config --global user.email "bot@formbuilder.online"
-    - "git config --global user.name \"\U0001F916\""
     - sudo apt-get update
     - sudo apt-get -y install python3-pip python-dev
     - sudo pip3 install --upgrade setuptools
diff --git a/tools/deploy.js b/tools/deploy.js
index 0461bf98f..900c7b17a 100644
--- a/tools/deploy.js
+++ b/tools/deploy.js
@@ -7,14 +7,13 @@ const onFinish = (err, cb) => {
     console.error(err);
     return process.exit(1);
   }
-}
+};
 
-// const deploySiteCommands = ['git submodule update --init --recursive', 'yarn docs', 'cd site', 'yarn deploy', 'cd ../'];
+const deploySiteCommands = ['yarn docs', 'cd site/', 'yarn deploy', 'cd ../']
 
 // Deploy the demo and site.
 exec('git push origin $(git subtree split --prefix demo $(git rev-parse --abbrev-ref HEAD)):gh-pages --force', err =>
-  onFinish(err, () => {
-    console.log('Demo successfully deployed');
-    // return exec(deploySiteCommands.join(' && '), err => onFinish(err, () => console.log('Site successfully deployed')))
-  })
+  onFinish(err, () => console.log('Demo successfully deployed'))
 );
+
+exec(deploySiteCommands.join(' && '), err => onFinish(err, () => console.log('Site successfully deployed')));