diff --git a/roles/appsmith/tasks/install.yml b/roles/appsmith/tasks/install.yml
index f39a6d1..9b1b5b0 100644
--- a/roles/appsmith/tasks/install.yml
+++ b/roles/appsmith/tasks/install.yml
@@ -97,17 +97,22 @@
       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
-      args:
-        chdir: "{{ appsmith_root_dir }}/src/app/client"
-
     - name: Build the client
       command: ./node_modules/.bin/craco --max-old-space-size=3072 build --config craco.build.config.js
       args:
         chdir: "{{ appsmith_root_dir }}/src/app/client"
 
+    - name: Remove Old Client
+      file:
+        path: "{{ appsmith_root_dir }}/client"
+        state: absent
+
+    - name: Copy the client
+      copy:
+        src: "{{ appsmith_root_dir }}/src/app/client/build"
+        dest: "{{ appsmith_root_dir }}/client"
+        remote_src: True
+
   # Note : the client will be deployed in {{ appsmith_root_dir }}/client
   # with a ExecStartPre hook of the server, which will take care of replacing
   # placeholders with current settings. So no need to do it here
diff --git a/roles/includes/webapps_set_install_mode.yml b/roles/includes/webapps_set_install_mode.yml
index 578a9d6..38f387c 100644
--- a/roles/includes/webapps_set_install_mode.yml
+++ b/roles/includes/webapps_set_install_mode.yml
@@ -21,7 +21,7 @@
 
 - name: Set install mode to upgrade
   set_fact: install_mode='upgrade'
-  when:
-    - version_file_stat.stat.exists
-    - current_version | string != version | string
-    - manage_upgrade | default(True)
+  #when:
+  #  - version_file_stat.stat.exists
+  #  - current_version | string != version | string
+  #  - manage_upgrade | default(True)