diff --git a/src/app/integrations/bamboo-hr/bamboo-hr.component.html b/src/app/integrations/bamboo-hr/bamboo-hr.component.html
index fd95cf955..7f6881cfd 100644
--- a/src/app/integrations/bamboo-hr/bamboo-hr.component.html
+++ b/src/app/integrations/bamboo-hr/bamboo-hr.component.html
@@ -20,7 +20,6 @@
     [isLoading]="isLoading" 
     [hideRefreshIcon]="hideRefreshIcon" 
     [showErrorScreen]="showErrorScreen" 
-    [isRecipeRunning]="bambooHrConfiguration?.recipe_status ? true : false"
     [isIntegrationSetupInProgress]="isBambooSetupInProgress" 
     [isIntegrationConnected]="isBambooConnected" 
     (connectIntegration)="openDialog()"
@@ -87,4 +86,4 @@
             <p-skeleton shape="rectangle"></p-skeleton>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/src/app/integrations/bamboo-hr/bamboo-hr.component.ts b/src/app/integrations/bamboo-hr/bamboo-hr.component.ts
index 36c0c5ae4..b148412dc 100644
--- a/src/app/integrations/bamboo-hr/bamboo-hr.component.ts
+++ b/src/app/integrations/bamboo-hr/bamboo-hr.component.ts
@@ -27,7 +27,7 @@ export class BambooHrComponent implements OnInit {
 
   isLoading: boolean = true;
 
-  hideRefreshIcon: boolean;
+  hideRefreshIcon: boolean = true;
 
   isConfigurationSaveInProgress: boolean;
 
@@ -98,6 +98,7 @@ export class BambooHrComponent implements OnInit {
     this.isConfigurationSaveInProgress = true;
     this.bambooHrService.postConfigurations(payload).subscribe((updatedConfiguration: BambooHRConfiguration) => {
       this.bambooHrConfiguration = updatedConfiguration;
+      this.hideRefreshIcon = false;
       this.isConfigurationSaveInProgress = false;
       this.displayToastMessage(ToastSeverity.SUCCESS, 'Configuration saved successfully');
       this.trackingService.trackTimeSpent(Page.CONFIGURE_BAMBOO_HR, this.sessionStartTime);
@@ -123,45 +124,6 @@ export class BambooHrComponent implements OnInit {
     });
   }
 
-  private setupBambooHr(): void {
-    const syncData = [];
-
-    if (!this.org.managed_user_id) {
-      syncData.push(this.orgService.createWorkatoWorkspace());
-    }
-
-    if (!this.bambooHrData || !this.bambooHrData.folder_id) {
-      syncData.push(this.bambooHrService.createFolder());
-    }
-
-    if (!this.bambooHrData || !this.bambooHrData.package_id) {
-      syncData.push(this.bambooHrService.uploadPackage());
-    }
-
-    if (!this.org.is_fyle_connected) {
-      syncData.push(this.orgService.connectFyle());
-    }
-
-    if (!this.org.is_sendgrid_connected) {
-      syncData.push(this.orgService.connectSendgrid());
-    }
-
-    if (syncData.length) {
-      this.isBambooSetupInProgress = true;
-      concat(...syncData).pipe(
-        toArray()
-      ).subscribe(() => {
-        this.isLoading = false;
-        this.isBambooSetupInProgress = false;
-      }, () => {
-        this.isLoading = false;
-        this.isBambooSetupInProgress = false;
-        this.showErrorScreen = true;
-      });
-    } else {
-      this.isLoading = false;
-    }
-  }
 
   private getBambooHrConfiguration(): void {
     const data = merge(
@@ -175,9 +137,11 @@ export class BambooHrComponent implements OnInit {
           this.additionalEmails = response;
         } else if (response?.hasOwnProperty('additional_email_options')) {
           this.bambooHrConfiguration = response;
+          this.hideRefreshIcon = false;
         }
       });
-      this.setupBambooHr();
+      this.isLoading = false;
+
     });
   }
 
diff --git a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
index 04af3ed0f..f471438dc 100644
--- a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
+++ b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.html
@@ -10,7 +10,7 @@
                 <div class="tw-pl-16-px tw-flex tw-flex-col">
                     <div class="tw-flex tw-pt-6-px">
                         <p class="tw-text-20-px tw-font-500 tw-text-normal-text-color">{{ appName }}</p>
-                        <svg-icon-sprite *ngIf="isIntegrationConnected && !isLoading && isRecipeRunning && !hideRefreshIcon" pTooltip="Sync Data" tooltipPosition="right" src="sync" width="18px" height="14px" class="tw-cursor-pointer tw-ml-10-px tw-pt-6-px tw-text-faded-text-color" (click)="syncData()"></svg-icon-sprite>
+                        <svg-icon-sprite *ngIf="isIntegrationConnected && !isLoading && !hideRefreshIcon" pTooltip="Sync Data" tooltipPosition="right" src="sync" width="18px" height="14px" class="tw-cursor-pointer tw-ml-10-px tw-pt-6-px tw-text-faded-text-color" (click)="syncData()"></svg-icon-sprite>
                     </div>
                     <p *ngIf="!isIntegrationSetupInProgress" class="tw-text-slightly-normal-text-color tw-pt-2-px tw-text-14-px tw-font-400 tw-flex">{{ appDescription }}
                         <span *ngIf="redirectLink" class="tw-text-hyperlink-color tw-flex tw-pl-4-px tw-cursor-pointer" (click)="windowService.openInNewTab(redirectLink)">
@@ -30,7 +30,7 @@
                     <i *ngIf="!isConnectionInProgress" class="tw-pl-10-px tw-pt-2-px !tw-text-12-px pi pi-arrow-right"></i>
                     <app-loader class="tw-ml-10-px" *ngIf="isConnectionInProgress" [styleClass]="'spinner-16-white tw-top-2-px'"></app-loader>
                 </button>
-                <button *ngIf="isIntegrationConnected && isRecipeRunning && appName !== AppName.GUSTO" pButton type="button" class="!tw-text-alert-toast remove-bg disconnect !tw-bg-white" (click)="disconnect()">
+                <button *ngIf="isIntegrationConnected && appName !== AppName.GUSTO" pButton type="button" class="!tw-text-alert-toast remove-bg disconnect !tw-bg-white" (click)="disconnect()">
                     {{ isConnectionInProgress ? 'Disconnecting' : 'Disconnect' }}
                 </button>
                 <button *ngIf="(appName === AppName.QBD || appName === AppName.INTACCT || appName === AppName.SAGE300 || appName === AppName.BUSINESS_CENTRAL)" pButton type="button" class="p-button-raised" (click)="connect()">
@@ -49,4 +49,4 @@
         </div>
 </div>
 
-<p class="tw-h-1-px tw-w-[100%] tw-bg-separator"></p>
\ No newline at end of file
+<p class="tw-h-1-px tw-w-[100%] tw-bg-separator"></p>
diff --git a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
index 3627f7384..56026569c 100644
--- a/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
+++ b/src/app/shared/components/helper/app-landing-page-header/app-landing-page-header.component.ts
@@ -81,7 +81,7 @@ export class AppLandingPageHeaderComponent implements OnInit {
 
   connect(): void {
 
-    if (this.appName === this.AppName.TRAVELPERK) {
+    if (this.appName === this.AppName.TRAVELPERK || this.appName === this.AppName.BAMBOO_HR) {
       this.initiateOAuth();
       return;
     } else if (this.postConnectionRoute === 'qbd/onboarding/export_settings') {