diff --git a/web/src/pages/ManageSpace/ManageRepositories/ManageRepositories.tsx b/web/src/pages/ManageSpace/ManageRepositories/ManageRepositories.tsx
index 3b96ea2b5..425ad2b60 100644
--- a/web/src/pages/ManageSpace/ManageRepositories/ManageRepositories.tsx
+++ b/web/src/pages/ManageSpace/ManageRepositories/ManageRepositories.tsx
@@ -33,21 +33,16 @@ export default function ManageRepositories() {
   const space = useGetSpaceParam()
   const pageScope = useGetCurrentPageScope()
   const history = useHistory()
-  const { routes, hooks, standalone } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
+  const { routes } = useAppContext()
   const [activeTab, setActiveTab] = React.useState<string>(settingSection || SettingsTab.labels)
   const { getString } = useStrings()
 
   const tabListArray = [
-    ...(isLabelEnabled || standalone
-      ? [
-          {
-            id: SettingsTab.labels,
-            title: getString('labels.labels'),
-            panel: <LabelsListing activeTab={activeTab} currentPageScope={pageScope} space={space} />
-          }
-        ]
-      : []),
+    {
+      id: SettingsTab.labels,
+      title: getString('labels.labels'),
+      panel: <LabelsListing activeTab={activeTab} currentPageScope={pageScope} space={space} />
+    },
     {
       id: SettingsTab.branchProtection,
       title: getString('branchProtection.title'),
diff --git a/web/src/pages/PullRequest/Conversation/Conversation.tsx b/web/src/pages/PullRequest/Conversation/Conversation.tsx
index 0d0e4678e..29efe4a67 100644
--- a/web/src/pages/PullRequest/Conversation/Conversation.tsx
+++ b/web/src/pages/PullRequest/Conversation/Conversation.tsx
@@ -100,8 +100,7 @@ export const Conversation: React.FC<ConversationProps> = ({
   refetchPullReq
 }) => {
   const { getString } = useStrings()
-  const { currentUser, routes, hooks } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
+  const { currentUser, routes } = useAppContext()
   const location = useLocation()
   const activities = usePullReqActivities()
   const {
@@ -270,8 +269,7 @@ export const Conversation: React.FC<ConversationProps> = ({
     () =>
       activityBlocks?.map((commentItems, index) => {
         const threadId = commentItems[0].payload?.id
-        const renderLabelActivities =
-          commentItems[0].payload?.type !== CommentType.LABEL_MODIFY || isLabelEnabled || standalone
+        const renderLabelActivities = commentItems[0].payload?.type !== CommentType.LABEL_MODIFY
         if (isSystemComment(commentItems)) {
           return (
             <Render key={`thread-${threadId}`} when={renderLabelActivities}>
diff --git a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
index 25b680c0a..890e2abd4 100644
--- a/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
+++ b/web/src/pages/PullRequest/Conversation/PullRequestSideBar/PullRequestSideBar.tsx
@@ -22,8 +22,6 @@ import cx from 'classnames'
 import { Container, Layout, Text, Avatar, FlexExpander, useToaster, Utils, stringSubstitute } from '@harnessio/uicore'
 import { Icon, IconName } from '@harnessio/icons'
 import { Color, FontVariation } from '@harnessio/design-system'
-import { Render } from 'react-jsx-match'
-import { useAppContext } from 'AppContext'
 import { OptionsMenuButton } from 'components/OptionsMenuButton/OptionsMenuButton'
 import { useStrings } from 'framework/strings'
 import type { TypesPullReq, RepoRepositoryOutput, EnumPullReqReviewDecision, TypesScopesLabels } from 'services/code'
@@ -47,8 +45,6 @@ interface PullRequestSideBarProps {
 }
 
 const PullRequestSideBar = (props: PullRequestSideBarProps) => {
-  const { standalone, hooks } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
   const [labelQuery, setLabelQuery] = useState<string>('')
   const { reviewers, repoMetadata, pullRequestMetadata, refetchReviewers, labels, refetchLabels, refetchActivities } =
     props
@@ -406,74 +402,73 @@ const PullRequestSideBar = (props: PullRequestSideBarProps) => {
             </Text>
           )} */}
         </Layout.Vertical>
-        <Render when={isLabelEnabled || standalone}>
-          <Layout.Vertical>
-            <Layout.Horizontal>
-              <Text style={{ lineHeight: '24px' }} font={{ variation: FontVariation.H6 }}>
-                {getString('labels.labels')}
-              </Text>
-              <FlexExpander />
 
-              <LabelSelector
-                pullRequestMetadata={pullRequestMetadata}
-                allLabelsData={labelsList}
-                refetchLabels={refetchLabels}
-                refetchlabelsList={refetchlabelsList}
-                repoMetadata={repoMetadata}
-                query={labelQuery}
-                setQuery={setLabelQuery}
-                labelListLoading={labelListLoading}
-                refetchActivities={refetchActivities}
-              />
+        <Layout.Vertical>
+          <Layout.Horizontal>
+            <Text style={{ lineHeight: '24px' }} font={{ variation: FontVariation.H6 }}>
+              {getString('labels.labels')}
+            </Text>
+            <FlexExpander />
+
+            <LabelSelector
+              pullRequestMetadata={pullRequestMetadata}
+              allLabelsData={labelsList}
+              refetchLabels={refetchLabels}
+              refetchlabelsList={refetchlabelsList}
+              repoMetadata={repoMetadata}
+              query={labelQuery}
+              setQuery={setLabelQuery}
+              labelListLoading={labelListLoading}
+              refetchActivities={refetchActivities}
+            />
+          </Layout.Horizontal>
+          <Container padding={{ top: 'medium', bottom: 'large' }}>
+            <Layout.Horizontal className={css.labelsLayout}>
+              {labels && labels.label_data?.length !== 0 ? (
+                labels?.label_data?.map((label, index) => (
+                  <Label
+                    key={index}
+                    name={label.key as string}
+                    label_color={label.color as ColorName}
+                    label_value={{
+                      name: label.assigned_value?.value as string,
+                      color: label.assigned_value?.color as ColorName
+                    }}
+                    scope={label.scope}
+                    removeLabelBtn={true}
+                    disableRemoveBtnTooltip={true}
+                    handleRemoveClick={() => {
+                      removeLabel({}, { pathParams: { label_id: label.id } })
+                        .then(() => {
+                          label.assigned_value?.value
+                            ? showSuccess(
+                                stringSubstitute(getString('labels.removedLabel'), {
+                                  label: `${label.key}:${label.assigned_value?.value}`
+                                }) as string
+                              )
+                            : showSuccess(
+                                stringSubstitute(getString('labels.removedLabel'), {
+                                  label: label.key
+                                }) as string
+                              )
+                          refetchActivities()
+                        })
+                        .catch(err => {
+                          showError(getErrorMessage(err))
+                        })
+                      refetchLabels()
+                    }}
+                  />
+                ))
+              ) : (
+                <Text color={Color.GREY_300} font={{ variation: FontVariation.BODY2_SEMI, size: 'small' }}>
+                  {getString('labels.noLabels')}
+                </Text>
+              )}
+              {removingLabel && <Spinner size={16} />}
             </Layout.Horizontal>
-            <Container padding={{ top: 'medium', bottom: 'large' }}>
-              <Layout.Horizontal className={css.labelsLayout}>
-                {labels && labels.label_data?.length !== 0 ? (
-                  labels?.label_data?.map((label, index) => (
-                    <Label
-                      key={index}
-                      name={label.key as string}
-                      label_color={label.color as ColorName}
-                      label_value={{
-                        name: label.assigned_value?.value as string,
-                        color: label.assigned_value?.color as ColorName
-                      }}
-                      scope={label.scope}
-                      removeLabelBtn={true}
-                      disableRemoveBtnTooltip={true}
-                      handleRemoveClick={() => {
-                        removeLabel({}, { pathParams: { label_id: label.id } })
-                          .then(() => {
-                            label.assigned_value?.value
-                              ? showSuccess(
-                                  stringSubstitute(getString('labels.removedLabel'), {
-                                    label: `${label.key}:${label.assigned_value?.value}`
-                                  }) as string
-                                )
-                              : showSuccess(
-                                  stringSubstitute(getString('labels.removedLabel'), {
-                                    label: label.key
-                                  }) as string
-                                )
-                            refetchActivities()
-                          })
-                          .catch(err => {
-                            showError(getErrorMessage(err))
-                          })
-                        refetchLabels()
-                      }}
-                    />
-                  ))
-                ) : (
-                  <Text color={Color.GREY_300} font={{ variation: FontVariation.BODY2_SEMI, size: 'small' }}>
-                    {getString('labels.noLabels')}
-                  </Text>
-                )}
-                {removingLabel && <Spinner size={16} />}
-              </Layout.Horizontal>
-            </Container>
-          </Layout.Vertical>
-        </Render>
+          </Container>
+        </Layout.Vertical>
       </Container>
     </Container>
   )
diff --git a/web/src/pages/PullRequests/PullRequests.tsx b/web/src/pages/PullRequests/PullRequests.tsx
index 5701a98d3..2875bbb53 100644
--- a/web/src/pages/PullRequests/PullRequests.tsx
+++ b/web/src/pages/PullRequests/PullRequests.tsx
@@ -77,7 +77,6 @@ export default function PullRequests() {
   const { getString } = useStrings()
   const history = useHistory()
   const { routes, hooks, standalone, routingId } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
   const [searchTerm, setSearchTerm] = useState<string | undefined>()
   const browserParams = useQueryParams<PageBrowserProps>()
   const [filter, setFilter] = useState(browserParams?.state || (PullRequestFilterOption.OPEN as string))
@@ -295,13 +294,7 @@ export default function PullRequests() {
                             </Text>
                           </Container>
                         </Layout.Horizontal>
-                        <Render
-                          when={
-                            (isLabelEnabled || standalone) &&
-                            row.original &&
-                            row.original.labels &&
-                            row.original.labels.length !== 0
-                          }>
+                        <Render when={row.original && row.original.labels && row.original.labels.length !== 0}>
                           {row.original?.labels?.map((label, index) => (
                             <Label
                               key={index}
@@ -441,8 +434,7 @@ export default function PullRequests() {
                     </Text>
                   </Render>
 
-                  {(isLabelEnabled || standalone) &&
-                    labelFilter &&
+                  {labelFilter &&
                     labelFilter?.length !== 0 &&
                     labelFilter?.map((label, index) => (
                       <Label
diff --git a/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx b/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
index 6868f059a..51ca6ee7a 100644
--- a/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
+++ b/web/src/pages/PullRequests/PullRequestsContentHeader/PullRequestsContentHeader.tsx
@@ -28,7 +28,6 @@ import {
 } from '@harnessio/uicore'
 import { Color, FontVariation } from '@harnessio/design-system'
 import { sortBy } from 'lodash-es'
-import { Render } from 'react-jsx-match'
 import { getConfig, getUsingFetch } from 'services/config'
 import { useStrings } from 'framework/strings'
 import { CodeIcon, GitInfoProps, makeDiffRefs, PullRequestFilterOption } from 'utils/GitUtils'
@@ -76,7 +75,6 @@ export function PullRequestsContentHeader({
   const [loadingAuthors, setLoadingAuthors] = useState<boolean>(false)
   const space = useGetSpaceParam()
   const { hooks, currentUser, standalone, routingId, routes } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
   const permPushResult = hooks?.usePermissionTranslate?.(
     {
       resource: {
@@ -194,16 +192,16 @@ export function PullRequestsContentHeader({
           }}
         />
         <FlexExpander />
-        <Render when={isLabelEnabled || standalone}>
-          <LabelFilter
-            labelFilterOption={labelFilterOption}
-            setLabelFilterOption={setLabelFilterOption}
-            onPullRequestLabelFilterChanged={onPullRequestLabelFilterChanged}
-            bearerToken={bearerToken}
-            repoMetadata={repoMetadata}
-            spaceRef={space}
-          />
-        </Render>
+
+        <LabelFilter
+          labelFilterOption={labelFilterOption}
+          setLabelFilterOption={setLabelFilterOption}
+          onPullRequestLabelFilterChanged={onPullRequestLabelFilterChanged}
+          bearerToken={bearerToken}
+          repoMetadata={repoMetadata}
+          spaceRef={space}
+        />
+
         <DropDown
           value={authorFilterOption}
           items={() => getAuthorsPromise()}
diff --git a/web/src/pages/RepositorySettings/RepositorySettings.tsx b/web/src/pages/RepositorySettings/RepositorySettings.tsx
index 1064974ac..67a5cc9fd 100644
--- a/web/src/pages/RepositorySettings/RepositorySettings.tsx
+++ b/web/src/pages/RepositorySettings/RepositorySettings.tsx
@@ -40,8 +40,7 @@ export default function RepositorySettings() {
   const { repoMetadata, error, loading, refetch, settingSection, gitRef, resourcePath } = useGetRepositoryMetadata()
   const space = useGetSpaceParam()
   const history = useHistory()
-  const { routes, hooks, standalone } = useAppContext()
-  const { CODE_PULLREQ_LABELS: isLabelEnabled } = hooks?.useFeatureFlags()
+  const { routes } = useAppContext()
   const [activeTab, setActiveTab] = React.useState<string>(settingSection || SettingsTab.general)
   const { getString } = useStrings()
   const { isRepositoryEmpty } = useGetResourceContent({
@@ -66,22 +65,18 @@ export default function RepositorySettings() {
         </Container>
       )
     },
-    ...(isLabelEnabled || standalone
-      ? [
-          {
-            id: SettingsTab.labels,
-            title: getString('labels.labels'),
-            panel: (
-              <LabelsListing
-                activeTab={activeTab}
-                repoMetadata={repoMetadata}
-                currentPageScope={LabelsPageScope.REPOSITORY}
-                space={space}
-              />
-            )
-          }
-        ]
-      : []),
+    {
+      id: SettingsTab.labels,
+      title: getString('labels.labels'),
+      panel: (
+        <LabelsListing
+          activeTab={activeTab}
+          repoMetadata={repoMetadata}
+          currentPageScope={LabelsPageScope.REPOSITORY}
+          space={space}
+        />
+      )
+    },
     {
       id: SettingsTab.branchProtection,
       title: getString('branchProtection.title'),