diff --git a/.circleci/config.yml b/.circleci/config.yml
index d2d9d39a5d3..8347c51e733 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -118,9 +118,6 @@ jobs:
             # rm -rf node_modules
             # rm -f package-lock.json
             meteor npm install
-            cd packages/rocketchat-livechat/.app
-            meteor npm install
-            cd -
 
       - run:
           name: Lint
diff --git a/.circleci/snap.sh b/.circleci/snap.sh
index 190358750ba..d4d30c37124 100644
--- a/.circleci/snap.sh
+++ b/.circleci/snap.sh
@@ -13,7 +13,7 @@ cd $PWD/.snapcraft
 echo -e "Tag: $CIRCLE_TAG\r\nBranch: $CIRCLE_BRANCH\r\nBuild: $CIRCLE_BUILD_NUM\r\nCommit: $CIRCLE_SHA1" > buildinfo
 
 # Clone launchpad repo for the channel down.
-git clone -b $SNAP_CHANNEL git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad
+git clone -b $SNAP_CHANNEL --depth 1 git+ssh://rocket.chat.buildmaster@git.launchpad.net/rocket.chat launchpad
 
 # Rarely will change, but just incase we copy it all
 cp -r resources buildinfo snap launchpad/
diff --git a/.scripts/npm-postinstall.js b/.scripts/npm-postinstall.js
index b8362a2401d..43453910934 100644
--- a/.scripts/npm-postinstall.js
+++ b/.scripts/npm-postinstall.js
@@ -9,3 +9,5 @@ execSync('mkdir -p public/fonts/');
 execSync('cp node_modules/katex/dist/fonts/* public/fonts/');
 
 execSync('cp node_modules/pdfjs-dist/build/pdf.worker.min.js public/');
+
+execSync('cd packages/rocketchat-livechat/.app && (meteor npm install || npm install) && cd -');