diff --git a/src/main/webapp/app/springboot/primary/Generator.vue b/src/main/webapp/app/springboot/primary/Generator.vue
index 1080480d224..b6d6d16432e 100644
--- a/src/main/webapp/app/springboot/primary/Generator.vue
+++ b/src/main/webapp/app/springboot/primary/Generator.vue
@@ -102,25 +102,25 @@
           </div>
 
           <div class="col">
-            <div class="card h-100 text-white bg-primary bg-gradient shadow">
+            <div class="card h-100 text-white bg-secondary bg-gradient shadow">
               <h3 class="card-header h5 d-flex gap-3">
-                <IconVue :name="'body-text'" :aria-hidden="true" />
-                Setup tool
+                <IconVue :name="'gear'" :aria-hidden="true" />
+                Server
               </h3>
               <div class="card-body">
                 <ul class="list-group--inline">
                   <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
                     <div class="w-100 justify-content-between">
                       <input
-                        id="option-no-setup"
-                        v-model="setupTool"
+                        id="option-no-server"
+                        v-model="server"
                         class="form-check-input flex-shrink-0"
                         type="radio"
-                        name="setupTool"
+                        name="server"
                         value="none"
                         checked
                       />
-                      <label for="option-no-setup" role="button"> None </label>
+                      <label for="option-no-server" role="button"> None </label>
                     </div>
                     <img
                       src="../../../content/JHipster-Lite-neon-blue_40x.png"
@@ -133,32 +133,17 @@
                   <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
                     <div class="w-100 justify-content-between">
                       <input
-                        id="setup-tool-codespaces"
-                        v-model="setupTool"
-                        :data-selector="selectorPrefix + '.setup-tool-codespaces'"
-                        class="form-check-input flex-shrink-0"
-                        type="radio"
-                        name="setupTool"
-                        value="codespaces"
-                      />
-                      <label for="setup-tool-codespaces" role="button"> Codespaces </label>
-                    </div>
-                    <img src="../../../content/CodespacesLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
-                  </li>
-                  <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
-                    <div class="w-100 justify-content-between">
-                      <input
-                        id="setup-tool-gitpod"
-                        v-model="setupTool"
-                        :data-selector="selectorPrefix + '.setup-tool-gitpod'"
+                        id="option-springboot"
+                        v-model="server"
+                        :data-selector="selectorPrefix + '.option-springboot'"
                         class="form-check-input flex-shrink-0"
                         type="radio"
-                        name="setupTool"
-                        value="gitpod"
+                        name="server"
+                        value="springboot"
                       />
-                      <label for="setup-tool-gitpod" role="button"> Gitpod </label>
+                      <label for="option-springboot" role="button"> Spring Boot </label>
                     </div>
-                    <img src="../../../content/GitpodLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
+                    <img src="../../../content/SpringLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
                   </li>
                 </ul>
               </div>
@@ -166,25 +151,25 @@
           </div>
 
           <div class="col">
-            <div class="card h-100 text-white bg-secondary bg-gradient shadow">
+            <div class="card h-100 text-white bg-primary bg-gradient shadow">
               <h3 class="card-header h5 d-flex gap-3">
-                <IconVue :name="'gear'" :aria-hidden="true" />
-                Server
+                <IconVue :name="'body-text'" :aria-hidden="true" />
+                Setup tool
               </h3>
               <div class="card-body">
                 <ul class="list-group--inline">
                   <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
                     <div class="w-100 justify-content-between">
                       <input
-                        id="option-no-server"
-                        v-model="server"
+                        id="option-no-setup"
+                        v-model="setupTool"
                         class="form-check-input flex-shrink-0"
                         type="radio"
-                        name="server"
+                        name="setupTool"
                         value="none"
                         checked
                       />
-                      <label for="option-no-server" role="button"> None </label>
+                      <label for="option-no-setup" role="button"> None </label>
                     </div>
                     <img
                       src="../../../content/JHipster-Lite-neon-blue_40x.png"
@@ -197,17 +182,32 @@
                   <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
                     <div class="w-100 justify-content-between">
                       <input
-                        id="option-springboot"
-                        v-model="server"
-                        :data-selector="selectorPrefix + '.option-springboot'"
+                        id="setup-tool-codespaces"
+                        v-model="setupTool"
+                        :data-selector="selectorPrefix + '.setup-tool-codespaces'"
                         class="form-check-input flex-shrink-0"
                         type="radio"
-                        name="server"
-                        value="springboot"
+                        name="setupTool"
+                        value="codespaces"
                       />
-                      <label for="option-springboot" role="button"> Spring Boot </label>
+                      <label for="setup-tool-codespaces" role="button"> Codespaces </label>
                     </div>
-                    <img src="../../../content/SpringLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
+                    <img src="../../../content/CodespacesLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
+                  </li>
+                  <li class="list-group-item align-items-center gap-3 py-2" aria-current="true">
+                    <div class="w-100 justify-content-between">
+                      <input
+                        id="setup-tool-gitpod"
+                        v-model="setupTool"
+                        :data-selector="selectorPrefix + '.setup-tool-gitpod'"
+                        class="form-check-input flex-shrink-0"
+                        type="radio"
+                        name="setupTool"
+                        value="gitpod"
+                      />
+                      <label for="setup-tool-gitpod" role="button"> Gitpod </label>
+                    </div>
+                    <img src="../../../content/GitpodLogo.png" alt="" width="32" height="32" class="rounded-circle flex-shrink-0" />
                   </li>
                 </ul>
               </div>