diff --git a/roles/appsmith/defaults/main.yml b/roles/appsmith/defaults/main.yml
index 460980c..791a044 100644
--- a/roles/appsmith/defaults/main.yml
+++ b/roles/appsmith/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to deploy
-appsmith_version: 1.5.25
+appsmith_version: 1.6.13
 # URL of the source archive
 appsmith_archive_url: https://github.com/appsmithorg/appsmith/archive/v{{ appsmith_version }}.tar.gz
-# sha1sum of the archive
-appsmith_archive_sha1: dceebde21c7b0a989aa7fb96bac044df4f2ddf50
+# sha256sum of the archive
+appsmith_archive_sha256: 404512bc7d332ccb809e6ded5dc693b4fa03426e282b7c5ed862caa10b26c781
 
 # Root directory where appsmith will be installed
 appsmith_root_dir: /opt/appsmith
diff --git a/roles/appsmith/meta/main.yml b/roles/appsmith/meta/main.yml
index cb8d365..3da11b1 100644
--- a/roles/appsmith/meta/main.yml
+++ b/roles/appsmith/meta/main.yml
@@ -3,6 +3,8 @@
 dependencies:
   - role: mkdir
   - role: maven
+  - role: repo_nodejs
+    nodejs_major_version: 14
   - role: repo_mongodb
   - role: redis_server
     when: appsmith_redis_url | urlsplit('hostname') in ['localhost','127.0.0.1']
diff --git a/roles/appsmith/tasks/install.yml b/roles/appsmith/tasks/install.yml
index f39a6d1..96e5c30 100644
--- a/roles/appsmith/tasks/install.yml
+++ b/roles/appsmith/tasks/install.yml
@@ -44,6 +44,16 @@
   when: appsmith_install_mode == 'upgrade'
   tags: appsmith
 
+- name: Install expect node version
+  package: name=nodejs-14.15.4
+  tags: appsmith
+
+- name: Install yarn
+  npm:
+    name: yarn
+    global: True
+  tags: appsmith
+
 - when: appsmith_install_mode != 'none'
   block:
 
@@ -51,7 +61,7 @@
       get_url:
         url: "{{ appsmith_archive_url }}"
         dest: "{{ appsmith_root_dir }}/tmp"
-        checksum: sha1:{{ appsmith_archive_sha1 }}
+        checksum: sha256:{{ appsmith_archive_sha256 }}
 
     - name: Extract appsmith archive
       unarchive:
@@ -87,19 +97,8 @@
       copy: src={{ item }} dest={{ appsmith_root_dir }}/server/plugins/ remote_src=True
       loop: "{{ appsmith_plugins_jar.stdout_lines }}"
 
-    - name: Install yarn
-      npm:
-        name: yarn
-        path: "{{ appsmith_root_dir }}/src/app/client"
-
     - name: Install NodeJS dependencies
-      command: ./node_modules/yarn/bin/yarn install --ignore-engines
-      args:
-        chdir: "{{ appsmith_root_dir }}/src/app/client"
-
-    # Not sure why but yarn installs webpack 4.46.0 while appsmith wants 4.44.2
-    - name: Install correct webpack version
-      command: ./node_modules/yarn/bin/yarn add webpack@4.44.2 --ignore-engines
+      command: yarn install --ignore-engines
       args:
         chdir: "{{ appsmith_root_dir }}/src/app/client"
 
diff --git a/roles/appsmith/templates/env.j2 b/roles/appsmith/templates/env.j2
index 62c416b..a46ff48 100644
--- a/roles/appsmith/templates/env.j2
+++ b/roles/appsmith/templates/env.j2
@@ -23,3 +23,4 @@ APPSMITH_SIGNUP_DISABLED={{ appsmith_user_signup | ternary('false','true') }}
 APPSMITH_SIGNUP_ALLOWED_DOMAINS={{ appsmith_signup_whitelist | join(',') }}
 {% endif %}
 APPSMITH_ADMIN_EMAILS={{ appsmith_admin_emails | join(',') }}
+APPSMITH_CLOUD_SERVICES_BASE_URL=""
diff --git a/roles/gitea/defaults/main.yml b/roles/gitea/defaults/main.yml
index cb40feb..f5f835f 100644
--- a/roles/gitea/defaults/main.yml
+++ b/roles/gitea/defaults/main.yml
@@ -1,11 +1,11 @@
 ---
 
 # Version to install
-gitea_version: 1.16.1
+gitea_version: 1.16.2
 # URL to the binary
 gitea_bin_url: https://dl.gitea.io/gitea/{{ gitea_version }}/gitea-{{ gitea_version }}-linux-amd64
 # sha256 of the binary
-gitea_bin_sha256: f03f3a3c4dccc2219351cde5c9af372715b2ec3e88a821779702bc6f38084c97
+gitea_bin_sha256: ec9b01d119cfe47df44d580c1d321132ce054ff139b05b0a35da91268ca2bcbe
 # Handle updates. If set to false, ansible will only install
 # Gitea and then won't touch an existing installation
 gitea_manage_upgrade: True
diff --git a/roles/mongodb_server/tasks/install.yml b/roles/mongodb_server/tasks/install.yml
index ff00e60..e0e5112 100644
--- a/roles/mongodb_server/tasks/install.yml
+++ b/roles/mongodb_server/tasks/install.yml
@@ -14,8 +14,9 @@
 
 # We install from pip because pymongo available in repo for both EL7 and EL8 is too old
 # it doesn't support CRAM-SHA-256 for example
+# But pymongo 4 isn't yet working with ansible, so install latest 3.x version
 - name: Install pymongo
-  pip: name=pymongo state=latest
+  pip: name=pymongo==3.12.3 state=present
   tags: mongo
 
 - name: Create data dir