diff --git a/lib/components/ActionsMenu/index.js b/lib/components/ActionsMenu/index.js
index 7227f5dc..82591534 100644
--- a/lib/components/ActionsMenu/index.js
+++ b/lib/components/ActionsMenu/index.js
@@ -321,7 +321,7 @@ export const ActionsMenuBody = ({
             >
               <div
                 ref={ref}
-                style={{ ...actionMenu.floatingStyles, zIndex: 21 }}
+                style={{ ...actionMenu.floatingStyles, zIndex: 1100 }}
                 aria-labelledby={actionMenu.labelId}
                 {...actionMenu.getFloatingProps(props)}
                 className="actionMenu-content"
diff --git a/lib/components/Modal/index.js b/lib/components/Modal/index.js
index 9c95c578..ced6d097 100644
--- a/lib/components/Modal/index.js
+++ b/lib/components/Modal/index.js
@@ -49,7 +49,7 @@ const Overlay = styled(Flex)`
 `;
 const Container = styled(Box)`
   position: relative;
-  z-index: 9001;
+  z-index: 1000;
   animation: 300ms ${fadeIn} ease-in-out, 300ms ${scaleIn} ease-in-out;
   display: flex;
   flex-direction: column;
diff --git a/lib/components/Popover/index.js b/lib/components/Popover/index.js
index 90ffc60a..0f00a604 100644
--- a/lib/components/Popover/index.js
+++ b/lib/components/Popover/index.js
@@ -335,7 +335,7 @@ export default function Popover({
           <StyledPopoverContainer
             className={`Tooltip popover ${visible ? "visible" : ""}`}
             ref={refs.setFloating}
-            style={{ ...floatingStyles, zIndex: 21 }}
+            style={{ ...floatingStyles, zIndex: 1100 }}
             {...getFloatingProps()}
           >
             <FloatingFocusManager
diff --git a/package-lock.json b/package-lock.json
index b184d3ab..eb2ac27f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "orcs-design-system",
-  "version": "3.2.15",
+  "version": "3.2.16",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "orcs-design-system",
-      "version": "3.2.15",
+      "version": "3.2.16",
       "dependencies": {
         "@emotion/react": "^11.11.4",
         "@emotion/styled": "^11.11.5",
diff --git a/package.json b/package.json
index d4957478..021ad81e 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "orcs-design-system",
-  "version": "3.2.15",
+  "version": "3.2.16",
   "engines": {
     "node": "20.12.2"
   },