diff --git a/.github/workflows/render-preview-deploy.yml b/.github/workflows/render-preview-deploy.yml
index a9dc5aed2c..c5cb025cba 100644
--- a/.github/workflows/render-preview-deploy.yml
+++ b/.github/workflows/render-preview-deploy.yml
@@ -393,6 +393,39 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+
+      - name: Sync repo
+        uses: actions/checkout@v3
+
+      - name: Check if Forked Repository
+        id: check_repo
+        run: |
+          if [[ "${{ github.event.pull_request.head.repo.fork }}" == "true" ]]; then
+            echo "is_fork=true" >> $GITHUB_ENV
+            echo "FORKED_OWNER=${{ github.event.pull_request.head.repo.owner.login }}" >> $GITHUB_ENV
+          else
+            echo "is_fork=false" >> $GITHUB_ENV
+          fi
+
+      - name: Set Repository URL
+        run: |
+          if [[ "$is_fork" == "true" ]]; then
+            echo "REPO_URL=https://github.com/${FORKED_OWNER}/ToolJet" >> $GITHUB_ENV
+          else
+            echo "REPO_URL=https://github.com/ToolJet/ToolJet" >> $GITHUB_ENV
+          fi
+
+      - name: Fetch and Checkout Forked Branch
+        if: env.is_fork == 'true'
+        run: |
+          git fetch origin pull/${{ github.event.number }}/head:${{ env.BRANCH_NAME }}
+          git checkout ${{ env.BRANCH_NAME }}
+
+      - name: Checkout Default Branch
+        if: env.is_fork == 'false'
+        uses: actions/checkout@v3
+
+
       - name: Creating deployment for Enterprise Edition
         id: create-ee-deployment
         run: |
@@ -408,7 +441,7 @@ jobs:
             "name": "ToolJet EE PR #${{ env.PR_NUMBER }}",
             "notifyOnFail": "default",
             "ownerId": "tea-caeo4bj19n072h3dddc0",
-            "repo": "https://github.com/ToolJet/ToolJet",
+            "repo": "'"$REPO_URL"'",
             "slug": "tooljet-ee-pr-${{ env.PR_NUMBER }}",
             "suspended": "not_suspended",
             "suspenders": [],
diff --git a/.version b/.version
index 92536a9e48..171a6a93d6 100644
--- a/.version
+++ b/.version
@@ -1 +1 @@
-3.12.0
+3.12.1
diff --git a/frontend/.version b/frontend/.version
index 92536a9e48..171a6a93d6 100644
--- a/frontend/.version
+++ b/frontend/.version
@@ -1 +1 @@
-3.12.0
+3.12.1
diff --git a/frontend/ee b/frontend/ee
index 518f3334b1..dd5796edcc 160000
--- a/frontend/ee
+++ b/frontend/ee
@@ -1 +1 @@
-Subproject commit 518f3334b12a83785fd37dd53b0245d72848211a
+Subproject commit dd5796edccc8d5eda524d804a222845791d733fb
diff --git a/frontend/src/_services/organization.service.js b/frontend/src/_services/organization.service.js
index 2075e5d9de..481e8576c4 100644
--- a/frontend/src/_services/organization.service.js
+++ b/frontend/src/_services/organization.service.js
@@ -13,6 +13,7 @@ export const organizationService = {
   getWorkspacesLimit,
   checkWorkspaceUniqueness,
   updateOrganization,
+  setDefaultWorkspace,
 };
 
 function getUsersByValue(searchInput) {
@@ -100,3 +101,8 @@ function checkWorkspaceUniqueness(name, slug) {
   const query = queryString.stringify({ name, slug });
   return fetch(`${config.apiUrl}/organizations/is-unique?${query}`, requestOptions).then(handleResponse);
 }
+
+function setDefaultWorkspace(workspaceId) {
+  const requestOptions = { method: 'PATCH', headers: authHeader(), credentials: 'include' };
+  return fetch(`${config.apiUrl}/organizations/${workspaceId}/default`, requestOptions).then(handleResponse);
+}
diff --git a/frontend/src/_styles/theme.scss b/frontend/src/_styles/theme.scss
index 1162f50687..b77c83ba30 100644
--- a/frontend/src/_styles/theme.scss
+++ b/frontend/src/_styles/theme.scss
@@ -10029,92 +10029,6 @@ tbody {
       }
     }
   }
-
-  .manage-ws-table-body {
-    width: 100%;
-
-    .workspace-table-row {
-      border-bottom: 1px solid var(--slate5);
-      height: 64px;
-      width: 100%;
-
-      .ws-name {
-        padding-left: 8px;
-
-
-        .current-workspace-tag {
-          font-weight: 500;
-          color: var(--indigo9);
-          font-size: 12px;
-          display: flex;
-          height: 21px;
-          width: 130px;
-          align-items: center;
-          margin-left: 20px;
-          padding: 4px 8px 5px 8px;
-          border: 1px solid var(--indigo7);
-          background-color: var(--indigo3);
-          border-radius: 100px;
-        }
-      }
-
-      .open-button-cont {
-        width: 44px;
-        padding: 0px 8px 0px 8px;
-
-        .workspace-open-btn {
-          width: 28px;
-          height: 28px;
-          background-color: var(--slate1);
-          border: 1px solid var(--slate7);
-          box-shadow: none;
-
-          &:hover {
-            background-color: var(--slate4);
-          }
-        }
-      }
-
-      .archive-btn-cont {
-        width: 103px;
-        padding-right: 8px;
-
-        .workspace-archive-btn {
-          width: 95px;
-          height: 28px;
-          background-color: var(--slate1);
-          box-shadow: none;
-          border: 1px solid var(--tomato7);
-          color: var(--tomato9);
-
-          &:hover {
-            background-color: var(--tomato3);
-          }
-
-          &:disabled {
-            border: 1px solid var(--slate7);
-          }
-        }
-
-        .workspace-active-btn {
-          width: 95px;
-          height: 28px;
-
-          background-color: var(--slate1);
-          box-shadow: none;
-          border: 1px solid var(--slate7);
-          color: var(--slate12);
-
-          &:hover {
-            background-color: var(--slate7);
-          }
-        }
-
-
-      }
-
-    }
-  }
 }
 
 .manage-workspace-table-wrap.dark-mode {