diff --git a/client/public/templates/questionnaire-template.yaml b/client/public/templates/questionnaire-template.yaml
index 4163e6edc5..b7f6913645 100644
--- a/client/public/templates/questionnaire-template.yaml
+++ b/client/public/templates/questionnaire-template.yaml
@@ -58,7 +58,6 @@ sections:
             risk: unknown
             rationale: Lack of clarity on architecture can lead to unplanned issues.
             mitigation: Conduct an architectural review.
-
       - order: 3
         text: Is your application's data storage cloud-optimized?
         explanation: Evaluate if the data storage solution is optimized for cloud usage.
@@ -81,6 +80,30 @@ sections:
             risk: yellow
             rationale: Hybrid solutions may have integration complexities.
             mitigation: Evaluate and optimize cloud integration points.
+      - order: 4
+        text: Are you currently using any form of container orchestration?
+        explanation: Determine if the application utilizes container orchestration tools like Kubernetes, Docker Swarm, etc.
+        excludeFor:
+          - category: Deployment
+            tag: Serverless
+          - category: Architecture
+            tag: Monolith
+        answers:
+          - order: 1
+            text: Kubernetes
+            risk: green
+            rationale: Kubernetes is a robust orchestrator for container management.
+            mitigation: Ensure Kubernetes configurations are optimized for cloud.
+          - order: 2
+            text: Docker Swarm
+            risk: green
+            rationale: Docker Swarm provides a simpler, yet effective, orchestration.
+            mitigation: Validate that Docker Swarm meets all cloud scalability requirements.
+          - order: 3
+            text: No Container Orchestration
+            risk: yellow
+            rationale: Lack of container orchestration can hinder cloud adaptability.
+            mitigation: Explore container orchestration options for better cloud integration.
 thresholds:
   red: 1
   yellow: 30
diff --git a/client/src/app/pages/applications/components/application-tags/application-tags.tsx b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
index ae7595e2f2..c33f41a63d 100644
--- a/client/src/app/pages/applications/components/application-tags/application-tags.tsx
+++ b/client/src/app/pages/applications/components/application-tags/application-tags.tsx
@@ -29,6 +29,7 @@ import {
 import { useLegacyFilterState } from "@app/hooks/useLegacyFilterState";
 import { useHistory } from "react-router-dom";
 import { ItemTagLabel } from "../../../../components/labels/item-tag-label/item-tag-label";
+import { capitalizeFirstLetter } from "@app/utils/utils";
 
 interface TagWithSource extends Tag {
   source?: string;
@@ -216,7 +217,7 @@ export const ApplicationTags: React.FC<ApplicationTagsProps> = ({
                   component="h3"
                   className={`${spacing.mtSm} ${spacing.mbSm} ${textStyles.fontSizeMd}`}
                 >
-                  {source === "" ? "Manual" : source}
+                  {source === "" ? "Manual" : capitalizeFirstLetter(source)}
                 </Text>
               </TextContent>
               {Array.from(tagCategoriesInThisSource).map((tagCategory) => {
diff --git a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
index 7aeae65abf..e40eac74e3 100644
--- a/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
+++ b/client/src/app/pages/migration-waves/components/stakeholders-table.tsx
@@ -58,11 +58,14 @@ export const WaveStakeholdersTable: React.FC<IWaveStakeholdersTableProps> = ({
       <Toolbar {...toolbarProps}>
         <ToolbarContent>
           <ToolbarItem {...paginationToolbarItemProps}>
-            <SimplePagination
-              idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
-              isTop
-              paginationProps={paginationProps}
-            />
+            {migrationWave.allStakeholders.length > 9 && (
+              <SimplePagination
+                idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+                isTop
+                paginationProps={paginationProps}
+                isCompact
+              />
+            )}
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
@@ -116,6 +119,14 @@ export const WaveStakeholdersTable: React.FC<IWaveStakeholdersTableProps> = ({
           </Tbody>
         </ConditionalTableBody>
       </Table>
+      {migrationWave.allStakeholders.length > 9 && (
+        <SimplePagination
+          idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+          isTop={false}
+          paginationProps={paginationProps}
+          isCompact
+        />
+      )}
     </>
   );
 };
diff --git a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
index 94b645a1f1..f56baa1a09 100644
--- a/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
+++ b/client/src/app/pages/migration-waves/components/wave-applications-table.tsx
@@ -73,11 +73,14 @@ export const WaveApplicationsTable: React.FC<IWaveApplicationsTableProps> = ({
       <Toolbar {...toolbarProps}>
         <ToolbarContent>
           <ToolbarItem {...paginationToolbarItemProps}>
-            <SimplePagination
-              idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
-              isTop
-              paginationProps={paginationProps}
-            />
+            {migrationWave.fullApplications.length > 9 && (
+              <SimplePagination
+                idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+                isTop
+                paginationProps={paginationProps}
+                isCompact
+              />
+            )}
           </ToolbarItem>
         </ToolbarContent>
       </Toolbar>
@@ -155,6 +158,14 @@ export const WaveApplicationsTable: React.FC<IWaveApplicationsTableProps> = ({
           </Tbody>
         </ConditionalTableBody>
       </Table>
+      {migrationWave.fullApplications.length > 9 && (
+        <SimplePagination
+          idPrefix={`expanded-migration-wave-${migrationWave.name}-apps-table`}
+          isTop={false}
+          paginationProps={paginationProps}
+          isCompact
+        />
+      )}
     </>
   );
 };
diff --git a/client/src/app/utils/utils.ts b/client/src/app/utils/utils.ts
index 7e7a9a0e35..607dc0d1c3 100644
--- a/client/src/app/utils/utils.ts
+++ b/client/src/app/utils/utils.ts
@@ -189,3 +189,6 @@ export const collapseSpacesAndCompare = (
 
   return a.localeCompare(b, locale);
 };
+
+export const capitalizeFirstLetter = (str: string) =>
+  str.charAt(0).toUpperCase() + str.slice(1);