diff --git a/frontend/src/AppBuilder/_stores/slices/environmentsAndVersionsSlice.js b/frontend/src/AppBuilder/_stores/slices/environmentsAndVersionsSlice.js
index 82a3af3d5e..1edd3994c5 100644
--- a/frontend/src/AppBuilder/_stores/slices/environmentsAndVersionsSlice.js
+++ b/frontend/src/AppBuilder/_stores/slices/environmentsAndVersionsSlice.js
@@ -136,7 +136,6 @@ export const createEnvironmentsAndVersionsSlice = (set, get) => ({
   updateVersionNameAction: async (appId, versionId, versionName, onSuccess, onFailure) => {
     try {
       await appVersionService.save(appId, versionId, { name: versionName });
-      console.log('happening');
 
       set((state) => {
         if (state.selectedVersion && state.selectedVersion.id === versionId) {
@@ -177,7 +176,7 @@ export const createEnvironmentsAndVersionsSlice = (set, get) => ({
           appVersionsLazyLoaded: false,
           selectedEnvironment: response.editorEnvironment,
           appVersionEnvironment: response.appVersionEnvironment,
-          environments: response.environments,
+          environments: response?.environments?.length ? response.environments : get().environments,
         };
 
         if (state.selectedVersion?.id === versionId) {
@@ -241,7 +240,6 @@ export const createEnvironmentsAndVersionsSlice = (set, get) => ({
             useStore.getState()?.license?.featureAccess
           ),
         };
-        console.log({ environment, get: get().appVersionEnvironment });
 
         const versionIsAvailableInEnvironment = environment?.priority <= get().currentAppVersionEnvironment?.priority;
         if (!versionIsAvailableInEnvironment) {
diff --git a/frontend/src/modules/onboarding/stores/onboardingStore/onboarding.store.js b/frontend/src/modules/onboarding/stores/onboardingStore/onboarding.store.js
index 14634be4b8..62bd090e72 100644
--- a/frontend/src/modules/onboarding/stores/onboardingStore/onboarding.store.js
+++ b/frontend/src/modules/onboarding/stores/onboardingStore/onboarding.store.js
@@ -69,7 +69,7 @@ const useCEOnboardingStore = create(
 
     createNewOnboardingApp: async () => {
       const session = authenticationService.currentSessionValue;
-      const app = await appsService.createApp({ name: 'My App' });
+      const app = await appsService.createApp({ name: 'My App', type: 'front-end' });
       const appId = app?.id;
       utils.clearPageHistory();
       const path = getSubpath()
@@ -80,7 +80,7 @@ const useCEOnboardingStore = create(
 
     setAccountCreated: (value) => set({ accountCreated: value }),
 
-    resumeSignupOnboarding: async (callBack = (resumeOnboardingSession = false) => { }) => {
+    resumeSignupOnboarding: async (callBack = (resumeOnboardingSession = false) => {}) => {
       return callBack(false);
     },
   }))
diff --git a/server/ee b/server/ee
index 4a7ef99d60..26447ec13d 160000
--- a/server/ee
+++ b/server/ee
@@ -1 +1 @@
-Subproject commit 4a7ef99d60c0b1c98558dafc73fbf72e05daf6cb
+Subproject commit 26447ec13d91119d001319ac940264bbc39a3b54