diff --git a/frontend/web/components/tags/AddEditTags.tsx b/frontend/web/components/tags/AddEditTags.tsx
index a0169eb9404a..0363268e061c 100644
--- a/frontend/web/components/tags/AddEditTags.tsx
+++ b/frontend/web/components/tags/AddEditTags.tsx
@@ -40,10 +40,14 @@ const AddEditTags: FC<AddEditTagsType> = ({
   const [tab, setTab] = useState<'SELECT' | 'CREATE' | 'EDIT'>('SELECT')
   const [deleteTag] = useDeleteTagMutation()
   const [createTag] = useCreateTagMutation()
-  const { permission: projectAdminPermission } = useHasPermission({
+  const permissionType = Utils.getFlagsmithHasFeature('manage_tags_permission')
+    ? 'MANAGE_TAGS'
+    : 'ADMIN'
+
+  const { permission: createEditTagPermission } = useHasPermission({
     id: projectId,
     level: 'project',
-    permission: 'ADMIN',
+    permission: permissionType,
   })
 
   useEffect(() => {
@@ -166,12 +170,14 @@ const AddEditTags: FC<AddEditTagsType> = ({
             !readOnly && (
               <div className='text-right'>
                 {Utils.renderWithPermission(
-                  projectAdminPermission,
-                  Constants.projectPermissions('Admin'),
+                  createEditTagPermission,
+                  Constants.projectPermissions(
+                    permissionType === 'ADMIN' ? 'Admin' : 'Manage Tags',
+                  ),
                   <div className='text-center'>
                     <Button
                       className=''
-                      disabled={!projectAdminPermission}
+                      disabled={!createEditTagPermission}
                       onClick={() => {
                         setTab('CREATE')
                         setFilter('')
@@ -206,7 +212,7 @@ const AddEditTags: FC<AddEditTagsType> = ({
                         />
                       </Flex>
                       {!readOnly &&
-                        !!projectAdminPermission &&
+                        !!createEditTagPermission &&
                         !tag.is_system_tag && (
                           <>
                             <div
diff --git a/frontend/web/components/tags/CreateEditTag.tsx b/frontend/web/components/tags/CreateEditTag.tsx
index c4b2a7a1a128..c68dc3a8d058 100644
--- a/frontend/web/components/tags/CreateEditTag.tsx
+++ b/frontend/web/components/tags/CreateEditTag.tsx
@@ -110,6 +110,9 @@ const CreateEditTag: FC<CreateEditTagType> = ({
     }
   }
 
+  const permissionType = Utils.getFlagsmithHasFeature('manage_tags_permission')
+    ? 'MANAGE_TAGS'
+    : 'ADMIN'
   return (
     <InlineModal
       title={title}
@@ -123,11 +126,17 @@ const CreateEditTag: FC<CreateEditTagType> = ({
           <Button onClick={onClose} type='button' theme='secondary'>
             Cancel
           </Button>
-          <Permission level='project' permission='ADMIN' id={projectId}>
+          <Permission
+            level='project'
+            permission={permissionType}
+            id={projectId}
+          >
             {({ permission }) =>
               Utils.renderWithPermission(
                 permission,
-                Constants.projectPermissions('Admin'),
+                Constants.projectPermissions(
+                  permissionType === 'ADMIN' ? 'Admin' : 'Manage Tags',
+                ),
                 <div className='ml-2'>
                   <Button
                     onClick={save}