diff --git a/.github/workflows/ci-test.yml b/.github/workflows/ci-test.yml
index 697ab069df..64257f5d21 100644
--- a/.github/workflows/ci-test.yml
+++ b/.github/workflows/ci-test.yml
@@ -166,18 +166,15 @@ jobs:
         working-directory: "."
         run: |
           mkdir -p cicontainerlocal/stacks/configuration/
-          mkdir -p cicontainerlocal/oldstack
 
-      - name: Download S3 image
-        uses: keithweaver/aws-s3-github-action@v1.0.0
+      #Download the oldstacks from appsmithorg/oldstacks repo
+      - name: Download the oldstack
+        uses: actions/checkout@v3
         with:
-          command: cp
-          source: s3://ci-assets--appsmith/
-          destination: /home/runner/work/appsmith/appsmith/cicontainerlocal/oldstack
-          aws_access_key_id: ${{ secrets.S3_CI_ASSETS_ACCESS_KEY_ID }}
-          aws_secret_access_key: ${{ secrets.S3_CI_ASSETS_SECRET_ACCESS_KEY }}
-          aws_region: ap-south-1
-          flags: --recursive
+          repository: appsmithorg/ci-oldstack
+          token: ${{ secrets.CYPRESS_GITHUB_PERSONAL_ACCESS_TOKEN }}
+          submodules: 'recursive'
+          path: cicontainerlocal/oldstack
 
       - name: Load docker image
         if: steps.run_result.outputs.run_result != 'success'
diff --git a/app/client/cypress/manual_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js b/app/client/cypress/integration/Regression_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js
similarity index 98%
rename from app/client/cypress/manual_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js
rename to app/client/cypress/integration/Regression_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js
index 825285a4d7..4e56300ec0 100644
--- a/app/client/cypress/manual_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js
+++ b/app/client/cypress/integration/Regression_TestSuite/UpgradeAppsmith/UpgradeAppsimth_spec.js
@@ -5,7 +5,7 @@ import { ObjectsRegistry } from "../../../support/Objects/Registry";
 let agHelper = ObjectsRegistry.AggregateHelper;
 const tedUrl = "http://localhost:5001/v1/parent/cmd";
 
-describe("Upgrade appsmith version", () => {
+describe.skip("Upgrade appsmith version", () => {
   it("Upgrade Appsmith version and verify the Applications", () => {
     const uuid = () => Cypress._.random(0, 10000);
     const name = uuid();