diff --git a/packages/web/src/components/ChooseConnectionSubstep/index.jsx b/packages/web/src/components/ChooseConnectionSubstep/index.jsx
index 5627906d..7efa1e77 100644
--- a/packages/web/src/components/ChooseConnectionSubstep/index.jsx
+++ b/packages/web/src/components/ChooseConnectionSubstep/index.jsx
@@ -186,7 +186,7 @@ function ChooseConnectionSubstep(props) {
           });
 
           await queryClient.invalidateQueries({
-            queryKey: ['stepConnection', step.id],
+            queryKey: ['steps', step.id, 'connection'],
           });
         }
       }
diff --git a/packages/web/src/components/DeleteRoleButton/index.ee.jsx b/packages/web/src/components/DeleteRoleButton/index.ee.jsx
index e55ee021..9ce25473 100644
--- a/packages/web/src/components/DeleteRoleButton/index.ee.jsx
+++ b/packages/web/src/components/DeleteRoleButton/index.ee.jsx
@@ -25,7 +25,7 @@ function DeleteRoleButton(props) {
   const handleConfirm = React.useCallback(async () => {
     try {
       await deleteRole();
-      queryClient.invalidateQueries({ queryKey: ['roles'] });
+      queryClient.invalidateQueries({ queryKey: ['admin', 'roles'] });
       setShowConfirmation(false);
       enqueueSnackbar(formatMessage('deleteRoleButton.successfullyDeleted'), {
         variant: 'success',
diff --git a/packages/web/src/components/DeleteUserButton/index.ee.jsx b/packages/web/src/components/DeleteUserButton/index.ee.jsx
index 34fe15da..7a28c7e2 100644
--- a/packages/web/src/components/DeleteUserButton/index.ee.jsx
+++ b/packages/web/src/components/DeleteUserButton/index.ee.jsx
@@ -25,7 +25,6 @@ function DeleteUserButton(props) {
     try {
       await deleteUser();
       queryClient.invalidateQueries({ queryKey: ['admin', 'users'] });
-      queryClient.invalidateQueries({ queryKey: ['admin', 'user', userId] });
       setShowConfirmation(false);
       enqueueSnackbar(formatMessage('deleteUserButton.successfullyDeleted'), {
         variant: 'success',
diff --git a/packages/web/src/components/Editor/index.jsx b/packages/web/src/components/Editor/index.jsx
index 0458094d..0995d300 100644
--- a/packages/web/src/components/Editor/index.jsx
+++ b/packages/web/src/components/Editor/index.jsx
@@ -39,9 +39,9 @@ function Editor(props) {
 
       await updateStep({ variables: { input: mutationInput } });
       await queryClient.invalidateQueries({
-        queryKey: ['stepConnection', step.id],
+        queryKey: ['steps', step.id, 'connection'],
       });
-      await queryClient.invalidateQueries({ queryKey: ['flow', flow.id] });
+      await queryClient.invalidateQueries({ queryKey: ['flows', flow.id] });
     },
     [updateStep, flow.id, queryClient],
   );
@@ -63,7 +63,7 @@ function Editor(props) {
 
       const createdStepId = createdStep.data.createStep.id;
       setCurrentStepId(createdStepId);
-      await queryClient.invalidateQueries({ queryKey: ['flow', flow.id] });
+      await queryClient.invalidateQueries({ queryKey: ['flows', flow.id] });
     },
     [createStep, flow.id, queryClient],
   );
diff --git a/packages/web/src/components/EditorLayout/index.jsx b/packages/web/src/components/EditorLayout/index.jsx
index f092ff69..626e11e2 100644
--- a/packages/web/src/components/EditorLayout/index.jsx
+++ b/packages/web/src/components/EditorLayout/index.jsx
@@ -48,7 +48,7 @@ export default function EditorLayout() {
         },
       });
 
-      await queryClient.invalidateQueries({ queryKey: ['flow', flowId] });
+      await queryClient.invalidateQueries({ queryKey: ['flows', flowId] });
     },
     [flowId, queryClient],
   );
@@ -71,7 +71,7 @@ export default function EditorLayout() {
         },
       });
 
-      await queryClient.invalidateQueries({ queryKey: ['flow', flowId] });
+      await queryClient.invalidateQueries({ queryKey: ['flows', flowId] });
     },
     [flowId, queryClient],
   );
diff --git a/packages/web/src/components/FlowContextMenu/index.jsx b/packages/web/src/components/FlowContextMenu/index.jsx
index 9be5ef9f..1b941b3b 100644
--- a/packages/web/src/components/FlowContextMenu/index.jsx
+++ b/packages/web/src/components/FlowContextMenu/index.jsx
@@ -28,7 +28,9 @@ function ContextMenu(props) {
       variables: { input: { id: flowId } },
     });
 
-    await queryClient.invalidateQueries({ queryKey: ['appFlows', appKey] });
+    await queryClient.invalidateQueries({
+      queryKey: ['apps', appKey, 'flows'],
+    });
     enqueueSnackbar(formatMessage('flow.successfullyDuplicated'), {
       variant: 'success',
       SnackbarProps: {
@@ -54,7 +56,9 @@ function ContextMenu(props) {
       },
     });
 
-    await queryClient.invalidateQueries({ queryKey: ['appFlows', appKey] });
+    await queryClient.invalidateQueries({
+      queryKey: ['apps', appKey, 'flows'],
+    });
     enqueueSnackbar(formatMessage('flow.successfullyDeleted'), {
       variant: 'success',
     });
diff --git a/packages/web/src/components/FlowStepContextMenu/index.jsx b/packages/web/src/components/FlowStepContextMenu/index.jsx
index 88b864eb..9fedb469 100644
--- a/packages/web/src/components/FlowStepContextMenu/index.jsx
+++ b/packages/web/src/components/FlowStepContextMenu/index.jsx
@@ -19,7 +19,7 @@ function FlowStepContextMenu(props) {
     async (event) => {
       event.stopPropagation();
       await deleteStep({ variables: { input: { id: stepId } } });
-      await queryClient.invalidateQueries({ queryKey: ['flow', flowId] });
+      await queryClient.invalidateQueries({ queryKey: ['flows', flowId] });
     },
     [stepId, queryClient],
   );
diff --git a/packages/web/src/components/TestSubstep/index.jsx b/packages/web/src/components/TestSubstep/index.jsx
index 4ca7aad7..92ee99ad 100644
--- a/packages/web/src/components/TestSubstep/index.jsx
+++ b/packages/web/src/components/TestSubstep/index.jsx
@@ -82,7 +82,7 @@ function TestSubstep(props) {
     });
 
     await queryClient.invalidateQueries({
-      queryKey: ['flow', flowId],
+      queryKey: ['flows', flowId],
     });
   }, [onSubmit, onContinue, isCompleted, queryClient, flowId]);
 
diff --git a/packages/web/src/components/UsageDataInformation/index.ee.jsx b/packages/web/src/components/UsageDataInformation/index.ee.jsx
index cfacc841..aec71761 100644
--- a/packages/web/src/components/UsageDataInformation/index.ee.jsx
+++ b/packages/web/src/components/UsageDataInformation/index.ee.jsx
@@ -94,7 +94,7 @@ export default function UsageDataInformation() {
 
   React.useEffect(() => {
     queryClient.invalidateQueries({
-      queryKey: ['planAndUsage', currentUserId],
+      queryKey: ['users', currentUserId, 'planAndUsage'],
     });
   }, [subscription, queryClient, currentUserId]);
 
diff --git a/packages/web/src/contexts/Paddle.ee.jsx b/packages/web/src/contexts/Paddle.ee.jsx
index 1611705a..b37b5d13 100644
--- a/packages/web/src/contexts/Paddle.ee.jsx
+++ b/packages/web/src/contexts/Paddle.ee.jsx
@@ -31,11 +31,11 @@ export const PaddleProvider = (props) => {
           // Paddle has side effects in the background,
           // so we need to refetch the relevant queries
           await queryClient.refetchQueries({
-            queryKey: ['userTrial'],
+            queryKey: ['users', 'me', 'trial'],
           });
 
           await queryClient.refetchQueries({
-            queryKey: ['subscription'],
+            queryKey: ['users', 'me', 'subscription'],
           });
 
           navigate(URLS.SETTINGS_BILLING_AND_USAGE, {
diff --git a/packages/web/src/hooks/useActionSubsteps.js b/packages/web/src/hooks/useActionSubsteps.js
index 7c4312d6..9ff7a951 100644
--- a/packages/web/src/hooks/useActionSubsteps.js
+++ b/packages/web/src/hooks/useActionSubsteps.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useActionSubsteps({ appKey, actionKey }) {
   const query = useQuery({
-    queryKey: ['actionSubsteps', appKey, actionKey],
+    queryKey: ['apps', appKey, 'actions', actionKey, 'substeps'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(
         `/v1/apps/${appKey}/actions/${actionKey}/substeps`,
diff --git a/packages/web/src/hooks/useActions.js b/packages/web/src/hooks/useActions.js
index 7d6d2c75..51d56927 100644
--- a/packages/web/src/hooks/useActions.js
+++ b/packages/web/src/hooks/useActions.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useActions(appKey) {
   const query = useQuery({
-    queryKey: ['actions', appKey],
+    queryKey: ['apps', appKey, 'actions'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/actions`, {
         signal,
diff --git a/packages/web/src/hooks/useAdminAppAuthClient.ee.js b/packages/web/src/hooks/useAdminAppAuthClient.ee.js
index b979d302..3ad618b9 100644
--- a/packages/web/src/hooks/useAdminAppAuthClient.ee.js
+++ b/packages/web/src/hooks/useAdminAppAuthClient.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useAdminAppAuthClient(id) {
   const query = useQuery({
-    queryKey: ['adminAppAuthClient', id],
+    queryKey: ['admin', 'appAuthClients', id],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/admin/app-auth-clients/${id}`, {
         signal,
diff --git a/packages/web/src/hooks/useAdminSamlAuthProviderRoleMappings.js b/packages/web/src/hooks/useAdminSamlAuthProviderRoleMappings.js
index 513239eb..a523374b 100644
--- a/packages/web/src/hooks/useAdminSamlAuthProviderRoleMappings.js
+++ b/packages/web/src/hooks/useAdminSamlAuthProviderRoleMappings.js
@@ -3,13 +3,13 @@ import { useQuery } from '@tanstack/react-query';
 import api from 'helpers/api';
 
 export default function useAdminSamlAuthProviderRoleMappings({
-  adminSamlAuthProviderId,
+  adminSamlAuthProviderId: providerId,
 }) {
   const query = useQuery({
-    queryKey: ['adminSamlAuthProviderRoleMappings', adminSamlAuthProviderId],
+    queryKey: ['admin', 'samlAuthProviders', providerId, 'roleMappings'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(
-        `/v1/admin/saml-auth-providers/${adminSamlAuthProviderId}/role-mappings`,
+        `/v1/admin/saml-auth-providers/${providerId}/role-mappings`,
         {
           signal,
         },
@@ -17,7 +17,7 @@ export default function useAdminSamlAuthProviderRoleMappings({
 
       return data;
     },
-    enabled: !!adminSamlAuthProviderId,
+    enabled: !!providerId,
   });
 
   return query;
diff --git a/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js b/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js
index a2ac0d4f..c557fcfd 100644
--- a/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js
+++ b/packages/web/src/hooks/useAdminSamlAuthProviders.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useAdminSamlAuthProviders() {
   const query = useQuery({
-    queryKey: ['adminSamlAuthProviders'],
+    queryKey: ['admin', 'samlAuthProviders'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/admin/saml-auth-providers', {
         signal,
diff --git a/packages/web/src/hooks/useAdminUser.js b/packages/web/src/hooks/useAdminUser.js
index 0f8e3ee9..1d010675 100644
--- a/packages/web/src/hooks/useAdminUser.js
+++ b/packages/web/src/hooks/useAdminUser.js
@@ -3,7 +3,7 @@ import api from 'helpers/api';
 
 export default function useAdminUser({ userId }) {
   const query = useQuery({
-    queryKey: ['admin', 'user', userId],
+    queryKey: ['admin', 'users', userId],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/admin/users/${userId}`, {
         signal,
diff --git a/packages/web/src/hooks/useAdminUsers.js b/packages/web/src/hooks/useAdminUsers.js
index 2b1ecb17..a2b5341b 100644
--- a/packages/web/src/hooks/useAdminUsers.js
+++ b/packages/web/src/hooks/useAdminUsers.js
@@ -3,7 +3,7 @@ import api from 'helpers/api';
 
 export default function useAdminUsers(page) {
   const query = useQuery({
-    queryKey: ['admin', 'users', page],
+    queryKey: ['admin', 'users', { page }],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/admin/users`, {
         signal,
diff --git a/packages/web/src/hooks/useApp.js b/packages/web/src/hooks/useApp.js
index d662b812..e9ae6f6d 100644
--- a/packages/web/src/hooks/useApp.js
+++ b/packages/web/src/hooks/useApp.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useApp(appKey) {
   const query = useQuery({
-    queryKey: ['app', appKey],
+    queryKey: ['apps', appKey],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}`, {
         signal,
diff --git a/packages/web/src/hooks/useAppAuth.js b/packages/web/src/hooks/useAppAuth.js
index f7ada050..0fbaf3c0 100644
--- a/packages/web/src/hooks/useAppAuth.js
+++ b/packages/web/src/hooks/useAppAuth.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useAppAuth(appKey) {
   const query = useQuery({
-    queryKey: ['appAuth', appKey],
+    queryKey: ['apps', appKey, 'auth'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/auth`, {
         signal,
diff --git a/packages/web/src/hooks/useAppConfig.ee.js b/packages/web/src/hooks/useAppConfig.ee.js
index 66857647..2aa9df81 100644
--- a/packages/web/src/hooks/useAppConfig.ee.js
+++ b/packages/web/src/hooks/useAppConfig.ee.js
@@ -3,7 +3,7 @@ import api from 'helpers/api';
 
 export default function useAppConfig(appKey) {
   const query = useQuery({
-    queryKey: ['appConfig', appKey],
+    queryKey: ['apps', appKey, 'config'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/config`, {
         signal,
diff --git a/packages/web/src/hooks/useAppConnections.js b/packages/web/src/hooks/useAppConnections.js
index cea0a23a..9e256d1c 100644
--- a/packages/web/src/hooks/useAppConnections.js
+++ b/packages/web/src/hooks/useAppConnections.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useAppConnections(appKey) {
   const query = useQuery({
-    queryKey: ['appConnections', appKey],
+    queryKey: ['apps', appKey, 'connections'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/connections`, {
         signal,
diff --git a/packages/web/src/hooks/useAppFlows.js b/packages/web/src/hooks/useAppFlows.js
index 8ff98766..b23af8e3 100644
--- a/packages/web/src/hooks/useAppFlows.js
+++ b/packages/web/src/hooks/useAppFlows.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useAppFlows({ appKey, page }, { enabled }) {
   const query = useQuery({
-    queryKey: ['appFlows', appKey, page],
+    queryKey: ['apps', appKey, 'flows', { page }],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/flows`, {
         params: {
diff --git a/packages/web/src/hooks/useAutomatischInfo.js b/packages/web/src/hooks/useAutomatischInfo.js
index ad176da5..f7ee73b1 100644
--- a/packages/web/src/hooks/useAutomatischInfo.js
+++ b/packages/web/src/hooks/useAutomatischInfo.js
@@ -8,7 +8,7 @@ export default function useAutomatischInfo() {
      * So we can set the `staleTime` to Infinity
      **/
     staleTime: Infinity,
-    queryKey: ['automatischInfo'],
+    queryKey: ['automatisch', 'info'],
     queryFn: async (payload, signal) => {
       const { data } = await api.get('/v1/automatisch/info', { signal });
 
diff --git a/packages/web/src/hooks/useConnectionFlows.js b/packages/web/src/hooks/useConnectionFlows.js
index ec8990b3..02e7af65 100644
--- a/packages/web/src/hooks/useConnectionFlows.js
+++ b/packages/web/src/hooks/useConnectionFlows.js
@@ -7,7 +7,7 @@ export default function useConnectionFlows(
   { enabled } = {},
 ) {
   const query = useQuery({
-    queryKey: ['connectionFlows', connectionId, page],
+    queryKey: ['connections', connectionId, 'flows', { page }],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/connections/${connectionId}/flows`, {
         params: {
diff --git a/packages/web/src/hooks/useCurrentUser.js b/packages/web/src/hooks/useCurrentUser.js
index c5679715..cdac0937 100644
--- a/packages/web/src/hooks/useCurrentUser.js
+++ b/packages/web/src/hooks/useCurrentUser.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useCurrentUser() {
   const query = useQuery({
-    queryKey: ['currentUser'],
+    queryKey: ['users', 'me'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/users/me`, {
         signal,
diff --git a/packages/web/src/hooks/useDynamicFields.js b/packages/web/src/hooks/useDynamicFields.js
index d15c0fd7..80a0a400 100644
--- a/packages/web/src/hooks/useDynamicFields.js
+++ b/packages/web/src/hooks/useDynamicFields.js
@@ -74,7 +74,7 @@ function useDynamicFields(stepId, schema) {
   }, [schema, formValues, getValues]);
 
   const query = useQuery({
-    queryKey: ['dynamicFields', stepId, computedVariables],
+    queryKey: ['steps', stepId, 'dynamicFields', computedVariables],
     queryFn: async ({ signal }) => {
       const { data } = await api.post(
         `/v1/steps/${stepId}/dynamic-fields`,
diff --git a/packages/web/src/hooks/useExecution.js b/packages/web/src/hooks/useExecution.js
index e9bbf9ef..d0a4fdf6 100644
--- a/packages/web/src/hooks/useExecution.js
+++ b/packages/web/src/hooks/useExecution.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useExecution({ executionId }) {
   const query = useQuery({
-    queryKey: ['execution', executionId],
+    queryKey: ['executions', executionId],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/executions/${executionId}`, {
         signal,
diff --git a/packages/web/src/hooks/useExecutionSteps.js b/packages/web/src/hooks/useExecutionSteps.js
index ddbd5643..03e1d435 100644
--- a/packages/web/src/hooks/useExecutionSteps.js
+++ b/packages/web/src/hooks/useExecutionSteps.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useExecutionSteps({ executionId }) {
   const query = useInfiniteQuery({
-    queryKey: ['executionSteps', executionId],
+    queryKey: ['executions', executionId, 'executionSteps'],
     queryFn: async ({ pageParam = 1, signal }) => {
       const { data } = await api.get(
         `/v1/executions/${executionId}/execution-steps`,
diff --git a/packages/web/src/hooks/useExecutions.js b/packages/web/src/hooks/useExecutions.js
index a2a964d5..c0f1fc28 100644
--- a/packages/web/src/hooks/useExecutions.js
+++ b/packages/web/src/hooks/useExecutions.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useExecutions({ page }, { refetchInterval } = {}) {
   const query = useQuery({
-    queryKey: ['executions', page],
+    queryKey: ['executions', { page }],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/executions`, {
         params: {
diff --git a/packages/web/src/hooks/useFlow.js b/packages/web/src/hooks/useFlow.js
index 8502d6b1..8fb7ee05 100644
--- a/packages/web/src/hooks/useFlow.js
+++ b/packages/web/src/hooks/useFlow.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useFlow(flowId) {
   const query = useQuery({
-    queryKey: ['flow', flowId],
+    queryKey: ['flows', flowId],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/flows/${flowId}`, {
         signal,
diff --git a/packages/web/src/hooks/useInvoices.ee.js b/packages/web/src/hooks/useInvoices.ee.js
index 82372df4..42468648 100644
--- a/packages/web/src/hooks/useInvoices.ee.js
+++ b/packages/web/src/hooks/useInvoices.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useInvoices() {
   const query = useQuery({
-    queryKey: ['invoices'],
+    queryKey: ['users', 'invoices'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/users/invoices', {
         signal,
diff --git a/packages/web/src/hooks/usePaddleInfo.ee.js b/packages/web/src/hooks/usePaddleInfo.ee.js
index b50b1366..bbfe933b 100644
--- a/packages/web/src/hooks/usePaddleInfo.ee.js
+++ b/packages/web/src/hooks/usePaddleInfo.ee.js
@@ -3,7 +3,7 @@ import api from 'helpers/api';
 
 export default function usePaddleInfo() {
   const query = useQuery({
-    queryKey: ['paddleInfo'],
+    queryKey: ['payment', 'paddleInfo'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/payment/paddle-info', {
         signal,
diff --git a/packages/web/src/hooks/usePaymentPlans.ee.js b/packages/web/src/hooks/usePaymentPlans.ee.js
index c36ef0f1..d887516a 100644
--- a/packages/web/src/hooks/usePaymentPlans.ee.js
+++ b/packages/web/src/hooks/usePaymentPlans.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function usePaymentPlans() {
   const query = useQuery({
-    queryKey: ['paymentPlans'],
+    queryKey: ['payment', 'plans'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/payment/plans', {
         signal,
diff --git a/packages/web/src/hooks/usePermissionCatalog.ee.js b/packages/web/src/hooks/usePermissionCatalog.ee.js
index adb34469..489a3982 100644
--- a/packages/web/src/hooks/usePermissionCatalog.ee.js
+++ b/packages/web/src/hooks/usePermissionCatalog.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function usePermissionCatalog() {
   const query = useQuery({
-    queryKey: ['permissionCatalog'],
+    queryKey: ['admin', 'permissions', 'catalog'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/admin/permissions/catalog', {
         signal,
diff --git a/packages/web/src/hooks/usePlanAndUsage.js b/packages/web/src/hooks/usePlanAndUsage.js
index ae98afe4..e653a144 100644
--- a/packages/web/src/hooks/usePlanAndUsage.js
+++ b/packages/web/src/hooks/usePlanAndUsage.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function usePlanAndUsage(userId) {
   const query = useQuery({
-    queryKey: ['planAndUsage', userId],
+    queryKey: ['users', userId, 'planAndUsage'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/users/${userId}/plan-and-usage`, {
         signal,
diff --git a/packages/web/src/hooks/useRole.ee.js b/packages/web/src/hooks/useRole.ee.js
index a1f12904..dcd58910 100644
--- a/packages/web/src/hooks/useRole.ee.js
+++ b/packages/web/src/hooks/useRole.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useRole({ roleId }) {
   const query = useQuery({
-    queryKey: ['role', roleId],
+    queryKey: ['admin', 'roles', roleId],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/admin/roles/${roleId}`, {
         signal,
diff --git a/packages/web/src/hooks/useRoles.ee.js b/packages/web/src/hooks/useRoles.ee.js
index 835f8170..bbfe1d4a 100644
--- a/packages/web/src/hooks/useRoles.ee.js
+++ b/packages/web/src/hooks/useRoles.ee.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 export default function useRoles() {
   const query = useQuery({
     staleTime: 0,
-    queryKey: ['roles'],
+    queryKey: ['admin', 'roles'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/admin/roles', {
         signal,
diff --git a/packages/web/src/hooks/useSamlAuthProvider.js b/packages/web/src/hooks/useSamlAuthProvider.js
index 74061204..c293eafd 100644
--- a/packages/web/src/hooks/useSamlAuthProvider.js
+++ b/packages/web/src/hooks/useSamlAuthProvider.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useSamlAuthProvider({ samlAuthProviderId } = {}) {
   const query = useQuery({
-    queryKey: ['samlAuthProvider', samlAuthProviderId],
+    queryKey: ['samlAuthProviders', samlAuthProviderId],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(
         `/v1/admin/saml-auth-providers/${samlAuthProviderId}`,
diff --git a/packages/web/src/hooks/useStepConnection.js b/packages/web/src/hooks/useStepConnection.js
index dace7518..8ed66f71 100644
--- a/packages/web/src/hooks/useStepConnection.js
+++ b/packages/web/src/hooks/useStepConnection.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useStepConnection(stepId) {
   const query = useQuery({
-    queryKey: ['stepConnection', stepId],
+    queryKey: ['steps', stepId, 'connection'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/steps/${stepId}/connection`, {
         signal,
diff --git a/packages/web/src/hooks/useStepWithTestExecutions.js b/packages/web/src/hooks/useStepWithTestExecutions.js
index 51ef2d20..48966c98 100644
--- a/packages/web/src/hooks/useStepWithTestExecutions.js
+++ b/packages/web/src/hooks/useStepWithTestExecutions.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useStepWithTestExecutions(stepId) {
   const query = useQuery({
-    queryKey: ['stepWithTestExecutions', stepId],
+    queryKey: ['steps', stepId, 'previousSteps'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/steps/${stepId}/previous-steps`, {
         signal,
diff --git a/packages/web/src/hooks/useSubscription.ee.js b/packages/web/src/hooks/useSubscription.ee.js
index 9f8ae544..7a3a711c 100644
--- a/packages/web/src/hooks/useSubscription.ee.js
+++ b/packages/web/src/hooks/useSubscription.ee.js
@@ -25,7 +25,7 @@ export default function useSubscription() {
   const [isPolling, setIsPolling] = React.useState(false);
 
   const { data } = useQuery({
-    queryKey: ['subscription'],
+    queryKey: ['users', 'me', 'subscription'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/users/me/subscription`, {
         signal,
diff --git a/packages/web/src/hooks/useTriggerSubsteps.js b/packages/web/src/hooks/useTriggerSubsteps.js
index c7f252b7..b77f631a 100644
--- a/packages/web/src/hooks/useTriggerSubsteps.js
+++ b/packages/web/src/hooks/useTriggerSubsteps.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useTriggerSubsteps({ appKey, triggerKey }) {
   const query = useQuery({
-    queryKey: ['triggerSubsteps', appKey, triggerKey],
+    queryKey: ['apps', appKey, 'triggers', triggerKey, 'substeps'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(
         `/v1/apps/${appKey}/triggers/${triggerKey}/substeps`,
diff --git a/packages/web/src/hooks/useTriggers.js b/packages/web/src/hooks/useTriggers.js
index 75d36665..e2641f4e 100644
--- a/packages/web/src/hooks/useTriggers.js
+++ b/packages/web/src/hooks/useTriggers.js
@@ -4,7 +4,7 @@ import api from 'helpers/api';
 
 export default function useTriggers(appKey) {
   const query = useQuery({
-    queryKey: ['triggers', appKey],
+    queryKey: ['apps', appKey, 'triggers'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get(`/v1/apps/${appKey}/triggers`, {
         signal,
diff --git a/packages/web/src/hooks/useUserTrial.ee.js b/packages/web/src/hooks/useUserTrial.ee.js
index 0ff5c80e..fdd0da1f 100644
--- a/packages/web/src/hooks/useUserTrial.ee.js
+++ b/packages/web/src/hooks/useUserTrial.ee.js
@@ -42,7 +42,7 @@ export default function useUserTrial() {
   const formatMessage = useFormatMessage();
 
   const { data } = useQuery({
-    queryKey: ['userTrial'],
+    queryKey: ['users', 'me', 'trial'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/users/me/trial', {
         signal,
diff --git a/packages/web/src/hooks/useVersion.js b/packages/web/src/hooks/useVersion.js
index d5073544..51f955db 100644
--- a/packages/web/src/hooks/useVersion.js
+++ b/packages/web/src/hooks/useVersion.js
@@ -7,7 +7,7 @@ import api from 'helpers/api';
 export default function useVersion() {
   const { data: notificationsData } = useAutomatischNotifications();
   const { data } = useQuery({
-    queryKey: ['automatischVersion'],
+    queryKey: ['automatisch', 'version'],
     queryFn: async ({ signal }) => {
       const { data } = await api.get('/v1/automatisch/version', {
         signal,
diff --git a/packages/web/src/pages/EditUser/index.jsx b/packages/web/src/pages/EditUser/index.jsx
index e4574f85..72094845 100644
--- a/packages/web/src/pages/EditUser/index.jsx
+++ b/packages/web/src/pages/EditUser/index.jsx
@@ -52,7 +52,6 @@ export default function EditUser() {
         },
       });
       queryClient.invalidateQueries({ queryKey: ['admin', 'users'] });
-      queryClient.invalidateQueries({ queryKey: ['admin', 'user', userId] });
 
       enqueueSnackbar(formatMessage('editUser.successfullyUpdated'), {
         variant: 'success',