diff --git a/.github/workflows/angular.yml b/.github/workflows/angular.yml
index 3f3b149a1f1a..c390c683d359 100644
--- a/.github/workflows/angular.yml
+++ b/.github/workflows/angular.yml
@@ -115,6 +115,9 @@ jobs:
       #----------------------------------------------------------------------
       - uses: jhipster/actions/compare-sample@v0
         id: compare
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         with:
           generator-path: generator-jhipster
           cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
diff --git a/.github/workflows/react.yml b/.github/workflows/react.yml
index 9bb69ffe17b4..43e08f081332 100644
--- a/.github/workflows/react.yml
+++ b/.github/workflows/react.yml
@@ -118,6 +118,9 @@ jobs:
         with:
           generator-path: generator-jhipster
           cmd: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         env:
           # generate-sample uses JHI_FOLDER_APP to generate the application.
           JHI_FOLDER_APP: ${{ github.workspace }}/base/app
diff --git a/.github/workflows/vue.yml b/.github/workflows/vue.yml
index 792f6f98b551..197890df66d3 100644
--- a/.github/workflows/vue.yml
+++ b/.github/workflows/vue.yml
@@ -106,6 +106,9 @@ jobs:
           generator-path: generator-jhipster
       - name: 'GENERATION: project'
         run: jh generate-sample ${{ matrix.name }} --skip-jhipster-dependencies --skip-checks --skip-install --no-insight
+        if: >-
+          github.event.pull_request &&
+          !contains(github.event.pull_request.labels.*.name, 'pr: disable-compare')
         env:
           JHI_FOLDER_APP: ${{ github.workspace }}/app
           JHIPSTER_DEPENDENCIES_VERSION: ${{ matrix.jhipster-bom-cicd-version }}
diff --git a/generators/server/generator.js b/generators/server/generator.js
index 9509acb3246d..7349ebcc46da 100644
--- a/generators/server/generator.js
+++ b/generators/server/generator.js
@@ -32,7 +32,6 @@ import {
   getPrimaryKeyValue as getPKValue,
   hibernateSnakeCase,
 } from './support/index.js';
-import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 
 import { GENERATOR_COMMON, GENERATOR_SPRING_BOOT } from '../generator-list.js';
 import BaseApplicationGenerator from '../base-application/index.js';
@@ -139,9 +138,6 @@ export default class JHipsterServerGenerator extends BaseApplicationGenerator {
         if (control.existingProject && this.options.askAnswered !== true) return;
         await this.promptCurrentJHipsterCommand();
       },
-      askForServerTestOpts,
-      askForServerSideOpts,
-      askForOptionalItems,
     });
   }
 
diff --git a/generators/spring-boot/generator.ts b/generators/spring-boot/generator.ts
index dd28798bae86..907ca475ed79 100644
--- a/generators/spring-boot/generator.ts
+++ b/generators/spring-boot/generator.ts
@@ -63,6 +63,7 @@ import {
 } from '../../jdl/index.js';
 import { writeFiles as writeEntityFiles } from './entity-files.js';
 import { getPomVersionProperties, parseMavenPom } from '../maven/support/index.js';
+import { askForOptionalItems, askForServerSideOpts, askForServerTestOpts } from './prompts.js';
 
 const { CAFFEINE, EHCACHE, HAZELCAST, INFINISPAN, MEMCACHED, REDIS, NO: NO_CACHE } = cacheTypes;
 const { NO: NO_WEBSOCKET, SPRING_WEBSOCKET } = websocketTypes;
@@ -106,6 +107,9 @@ export default class SpringBootGenerator extends BaseApplicationGenerator {
         if (control.existingProject && this.options.askAnswered !== true) return;
         await this.promptCurrentJHipsterCommand();
       },
+      askForServerTestOpts,
+      askForServerSideOpts,
+      askForOptionalItems,
     });
   }
 
diff --git a/generators/server/prompts.js b/generators/spring-boot/prompts.js
similarity index 98%
rename from generators/server/prompts.js
rename to generators/spring-boot/prompts.js
index dac4f6b50b23..2cbbd99d9c21 100644
--- a/generators/server/prompts.js
+++ b/generators/spring-boot/prompts.js
@@ -29,8 +29,8 @@ import {
   serviceDiscoveryTypes,
   testFrameworkTypes,
 } from '../../jdl/jhipster/index.js';
-import { MESSAGE_BROKER } from './options/index.js';
-import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from './support/database.js';
+import { MESSAGE_BROKER } from '../server/options/index.js';
+import { R2DBC_DB_OPTIONS, SQL_DB_OPTIONS } from '../server/support/database.js';
 
 const { OptionNames } = applicationOptions;
 const { GATEWAY, MICROSERVICE, MONOLITH } = applicationTypes;