diff --git a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
index d74b312b67..bc1723e9c9 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/gateway-claim-form-section/index.js
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import React, { useCallback, useEffect } from 'react'
+import React, { useEffect } from 'react'
 import { defineMessages } from 'react-intl'
 import { useFormikContext } from 'formik'
 
@@ -24,10 +24,6 @@ import Notification from '@ttn-lw/components/notification'
 import SubmitBar from '@ttn-lw/components/submit-bar'
 import FormSubmit from '@ttn-lw/components/form/submit'
 import SubmitButton from '@ttn-lw/components/submit-button'
-import Link from '@ttn-lw/components/link'
-import Tabs from '@ttn-lw/components/tabs'
-
-import Message from '@ttn-lw/lib/components/message'
 
 import { GsFrequencyPlansSelect as FrequencyPlansSelect } from '@console/containers/freq-plans-select'
 
@@ -37,12 +33,10 @@ import tooltipIds from '@ttn-lw/lib/constants/tooltip-ids'
 import getHostFromUrl from '@ttn-lw/lib/host-from-url'
 
 const { enabled: gsEnabled, base_url: gsBaseURL } = selectGsConfig()
-const smUrl = 'https://accounts.thethingsindustries.com'
 
 const m = defineMessages({
   claimWarning:
-    'We detected a Managed gateway. To claim this gateway with a subscription, use the owner token printed on the gateway, or add it to your Gateway Fleet using your <Link>fleet owner token.</Link>',
-  fleet: 'Fleet',
+    'We detected that your gateway is a <strong>Managed Gateway</strong>. To claim this gateway, please use the owner token printed on the inside of the mounting lid or scan the QR code to claim instantly.',
 })
 
 const initialValues = {
@@ -55,38 +49,10 @@ const initialValues = {
   target_gateway_server_address: gsEnabled ? getHostFromUrl(gsBaseURL) : '',
 }
 
-const ownerTokenTypes = [
-  { name: 'gateway', title: sharedMessages.gateway },
-  { name: 'fleet', title: m.fleet },
-]
-
 const GatewayClaimFormSection = () => {
-  const { values, addToFieldRegistry, removeFromFieldRegistry, setValues } = useFormikContext()
+  const { values, addToFieldRegistry, removeFromFieldRegistry } = useFormikContext()
   const isManaged = values._inputMethod === 'managed'
-  const isFleet = values._isFleet
-
-  const [activeOwnerTokenType, setActiveOwnerTokenType] = React.useState(
-    isFleet ? 'fleet' : 'gateway',
-  )
-
-  const onOwnerTokenTypeChange = useCallback(
-    value => {
-      setActiveOwnerTokenType(value)
-      setValues(values => ({
-        ...values,
-        authenticated_identifiers: {
-          ...values.authenticated_identifiers,
-          authentication_code:
-            value === 'fleet' && values._fleet_owner_token
-              ? btoa(values._fleet_owner_token)
-              : value === 'gateway' && values._gtw_owner_token
-                ? btoa(values._gtw_owner_token)
-                : '',
-        },
-      }))
-    },
-    [setValues],
-  )
+  const withQRdata = values._withQRdata
 
   // Register hidden fields so they don't get cleaned.
   useEffect(() => {
@@ -98,76 +64,28 @@ const GatewayClaimFormSection = () => {
   return (
     <>
       {isManaged && (
-        <>
-          <Form.InfoField>
-            <Notification
-              small
-              info
-              content={m.claimWarning}
-              messageValues={{
-                Link: val => (
-                  <Link.Anchor
-                    secondary
-                    href="https://www.thethingsindustries.com/docs/hardware/gateways/models/thethingsindoorgatewaypro/#finding-your-owner-token"
-                    external
-                  >
-                    {val}
-                  </Link.Anchor>
-                ),
-              }}
-              className="mb-0"
-            />
-          </Form.InfoField>
-          <Message content={sharedMessages.ownerToken} className="fw-bold" />
-          <Tabs
-            active={activeOwnerTokenType}
-            tabs={ownerTokenTypes}
-            onTabChange={onOwnerTokenTypeChange}
-            toggleStyle
+        <Form.InfoField>
+          <Notification
             small
-            className="w-content p-0 mb-cs-xs mt-cs-xxs border-none br-m gap-0 fs-s"
+            info
+            content={m.claimWarning}
+            messageValues={{
+              strong: txt => <strong>{txt}</strong>,
+            }}
+            className="mb-0"
           />
-          {activeOwnerTokenType === 'fleet' && (
-            <Message
-              content={sharedMessages.fleetInfo}
-              values={{
-                Link: val => (
-                  <Link.DocLink
-                    secondary
-                    path="/hardware/gateways/models/thethingsindoorgatewaypro/#subscription"
-                  >
-                    {val}
-                  </Link.DocLink>
-                ),
-              }}
-              className="mb-cs-xs c-text-neutral-light"
-              component="div"
-            />
-          )}
-        </>
+        </Form.InfoField>
       )}
       <Form.Field
         required
         title={sharedMessages.ownerToken}
-        showTitle={!isManaged}
         name="authenticated_identifiers.authentication_code"
         tooltipId={tooltipIds.CLAIM_AUTH_CODE}
         component={Input}
-        description={
-          isManaged && activeOwnerTokenType === 'fleet' ? sharedMessages.fleetTokenInfo : undefined
-        }
-        descriptionValues={{
-          Link: val => (
-            <Link.Anchor secondary href={`${smUrl}/dashboard/subscriptions?type=gateway`} external>
-              {val}
-            </Link.Anchor>
-          ),
-        }}
         encode={btoa}
         decode={atob}
+        disabled={withQRdata}
         sensitive
-        data-1p-ignore
-        data-lpignore
         autoFocus
       />
       <Form.Field
diff --git a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/validation-schema.js b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/validation-schema.js
index 57752a5fcf..5b158d970d 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/validation-schema.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/gateway-provisioning-form/validation-schema.js
@@ -19,7 +19,6 @@ import registerValidationSchema from './gateway-registration-form-section/valida
 
 export const validationSchema = Yup.object({
   _owner_id: Yup.string(),
-  _isFleet: Yup.boolean(),
 }).when('._inputMethod', {
   is: 'register',
   then: schema => schema.concat(registerValidationSchema),
diff --git a/pkg/webui/console/containers/gateway-onboarding-form/index.js b/pkg/webui/console/containers/gateway-onboarding-form/index.js
index e9a70918a2..68b10662bd 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/index.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/index.js
@@ -150,12 +150,13 @@ const GatewayOnboardingForm = props => {
             ...message,
             values: {
               link: content => (
-                <Link.DocLink
+                <Link.Anchor
                   secondary
-                  path="/hardware/gateways/models/thethingsindoorgatewaypro/#subscription"
+                  external
+                  href="https://accounts.thethingsindustries.com/gateway-status"
                 >
                   {content}
-                </Link.DocLink>
+                </Link.Anchor>
               ),
             },
           }
diff --git a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/fleets-scan.js b/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/fleets-scan.js
deleted file mode 100644
index 024cc2bcff..0000000000
--- a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/fleets-scan.js
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright © 2025 The Things Network Foundation, The Things Industries B.V.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-import React, { useCallback } from 'react'
-import { defineMessages } from 'react-intl'
-
-import { IconPlus } from '@ttn-lw/components/icon'
-import Link from '@ttn-lw/components/link'
-import Button from '@ttn-lw/components/button'
-import Input from '@ttn-lw/components/input'
-
-import Message from '@ttn-lw/lib/components/message'
-
-import sharedMessages from '@ttn-lw/lib/shared-messages'
-import PropTypes from '@ttn-lw/lib/prop-types'
-
-const smUrl = 'https://accounts.thethingsindustries.com'
-
-const m = defineMessages({
-  addFleet: 'Add to Fleet',
-  fleetToken: 'Fleet owner token',
-  addToFleetTooltip:
-    'You are registering a Managed gateway. If you want to add it to an existing fleet, click here.',
-})
-
-const FleetsScan = ({ qrData, setQrData }) => {
-  const [isAddToFleet, setIsAddToFleet] = React.useState(false)
-  const [fleetOwnerToken, setFleetOwnerToken] = React.useState('')
-
-  const handleAddToFleet = useCallback(() => {
-    setIsAddToFleet(true)
-  }, [])
-
-  const handleRemoveFleet = useCallback(() => {
-    setIsAddToFleet(false)
-    setFleetOwnerToken('')
-    setQrData(prevQrData => ({
-      ...prevQrData,
-      gateway: { ...prevQrData.gateway, _fleet_owner_token: undefined },
-    }))
-  }, [setQrData])
-
-  const handleFleetTokenChange = useCallback(
-    value => {
-      setFleetOwnerToken(value)
-      setQrData(prevQrData => ({
-        ...prevQrData,
-        gateway: { ...prevQrData.gateway, _fleet_owner_token: value },
-      }))
-    },
-    [setQrData],
-  )
-
-  return qrData?.gateway?.is_managed ? (
-    <>
-      {isAddToFleet ? (
-        <div className="w-full mt-cs-xs">
-          <div className="d-flex j-between">
-            <Message content={m.fleetToken} className="c-text-neutral-semilight" />
-            <Button
-              message={sharedMessages.remove}
-              onClick={handleRemoveFleet}
-              className="c-text-neutral-light fw-bold hover-underline"
-            />
-          </div>
-          <Message
-            content={sharedMessages.fleetTokenInfo}
-            values={{
-              Link: val => (
-                <Link.Anchor
-                  secondary
-                  href={`${smUrl}/dashboard/subscriptions?type=gateway`}
-                  external
-                >
-                  {val}
-                </Link.Anchor>
-              ),
-            }}
-            className="mb-cs-xs mt-cs-xxs c-text-neutral-light fs-s"
-            component="div"
-          />
-          <Input
-            type="code"
-            sensitive
-            className="w-full"
-            inputWidth="full"
-            value={fleetOwnerToken}
-            onChange={handleFleetTokenChange}
-          />
-          <Message
-            content={sharedMessages.fleetInfo}
-            values={{
-              Link: val => (
-                <Link.DocLink
-                  secondary
-                  path="/hardware/gateways/models/thethingsindoorgatewaypro/#subscription"
-                >
-                  {val}
-                </Link.DocLink>
-              ),
-            }}
-            className="mt-cs-xs c-text-neutral-light fs-s"
-            component="div"
-          />
-        </div>
-      ) : (
-        <Button
-          tertiary
-          message={m.addFleet}
-          icon={IconPlus}
-          onClick={handleAddToFleet}
-          className="mt-cs-xs"
-          tooltip={m.addToFleetTooltip}
-          tooltipPlacement="bottom"
-        />
-      )}
-    </>
-  ) : null
-}
-
-FleetsScan.propTypes = {
-  qrData: PropTypes.shape({
-    gateway: PropTypes.shape({
-      is_managed: PropTypes.bool,
-      _fleet_owner_token: PropTypes.string,
-      owner_token: PropTypes.string,
-    }),
-  }).isRequired,
-  setQrData: PropTypes.func.isRequired,
-}
-
-export default FleetsScan
diff --git a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js b/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
index 1d2490d6ff..64c02bed9f 100644
--- a/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
+++ b/pkg/webui/console/containers/gateway-onboarding-form/qr-scan-section/index.js
@@ -29,9 +29,6 @@ import sharedMessages from '@ttn-lw/lib/shared-messages'
 
 // TODO: Get the correct sdk (gateway qr code generator)
 import { parseGatewayQRCode } from '@console/store/actions/qr-code-generator'
-import { getGatewayClaimInfoByEui } from '@console/store/actions/gateways'
-
-import FleetsScan from './fleets-scan'
 
 const m = defineMessages({
   hasGatewayQR:
@@ -39,7 +36,6 @@ const m = defineMessages({
   gatewayGuide: 'Gateway registration help',
   invalidQRCode:
     'Invalid QR code data. Please note that only TTIGPRO1 Gateway Identification QR Code can be scanned. Some gateways have unrelated QR codes printed on them that cannot be used.',
-  gatewayOwnerToken: 'Gateway owner token',
 })
 
 const qrDataInitialState = {
@@ -61,6 +57,7 @@ const GatewayQRScanSection = () => {
 
   const handleQRCodeApprove = useCallback(() => {
     const { gateway } = qrData
+
     setValues(values => ({
       ...values,
       _withQRdata: true,
@@ -70,15 +67,8 @@ const GatewayQRScanSection = () => {
       },
       authenticated_identifiers: {
         gateway_eui: gateway.gateway_eui,
-        authentication_code: gateway._fleet_owner_token
-          ? btoa(gateway._fleet_owner_token)
-          : gateway.owner_token
-            ? btoa(gateway.owner_token)
-            : '',
+        authentication_code: gateway.owner_token ? btoa(gateway.owner_token) : '',
       },
-      _gtw_owner_token: gateway.owner_token ?? '',
-      _fleet_owner_token: gateway._fleet_owner_token ?? '',
-      _isFleet: Boolean(gateway._fleet_owner_token),
     }))
 
     setQrData({ ...qrData, approved: true })
@@ -93,26 +83,23 @@ const GatewayQRScanSection = () => {
       try {
         // Get gateway from QR code
         const gateway = await dispatch(attachPromise(parseGatewayQRCode(qrCode)))
-        const gatewayEui = gateway.gateway_eui
-        const { is_managed } = await dispatch(attachPromise(getGatewayClaimInfoByEui(gatewayEui)))
-        gateway.is_managed = is_managed
 
         const sheetData = [
           {
             header: sharedMessages.qrCodeData,
             items: [
+              {
+                key: sharedMessages.ownerToken,
+                value: gateway.owner_token,
+                type: 'code',
+                sensitive: true,
+              },
               {
                 key: sharedMessages.gatewayEUI,
                 value: gateway.gateway_eui,
                 type: 'byte',
                 sensitive: false,
               },
-              {
-                key: m.gatewayOwnerToken,
-                value: gateway.owner_token,
-                type: 'code',
-                sensitive: true,
-              },
             ],
           },
         ]
@@ -166,7 +153,6 @@ const GatewayQRScanSection = () => {
             onCancel={handleQRCodeCancel}
             onRead={handleQRCodeRead}
             qrData={qrData}
-            modalDataChildren={<FleetsScan qrData={qrData} setQrData={setQrData} />}
           />
         )}
       </ButtonGroup>
diff --git a/pkg/webui/lib/errors/utils.js b/pkg/webui/lib/errors/utils.js
index e4e2433ca1..7b9af5a2e4 100644
--- a/pkg/webui/lib/errors/utils.js
+++ b/pkg/webui/lib/errors/utils.js
@@ -598,7 +598,7 @@ export const ingestError = (error, extras = {}, tags = {}) => {
  * @param {object} error - The error object.
  * @returns {object|undefined} - The corresponding error message, or undefined if no match.
  */
-const qrCodeSuffix = 'Scan the QR code on the gateway to open the Gateway Status page.'
+const qrCodeSuffix = 'Scan the QR code on the gateway to open the <link>Gateway Status page.</link>'
 
 export const getClaimGatewayErrorMessage = error => {
   const m = defineMessages({
diff --git a/pkg/webui/lib/shared-messages.js b/pkg/webui/lib/shared-messages.js
index dc12b6ec4e..0d0e7ac68d 100644
--- a/pkg/webui/lib/shared-messages.js
+++ b/pkg/webui/lib/shared-messages.js
@@ -278,10 +278,6 @@ export default defineMessages({
   fCnt: 'FCnt',
   fetching: 'Fetching data…',
   firmwareVersion: 'Firmware version',
-  fleetInfo:
-    'Adding a gateway to a Fleet will claim the gateway using an available Slot. <Link>Read docs.</Link>',
-  fleetTokenInfo:
-    'Log in to <Link>your billing account.</Link> Select the fleet and copy the token.',
   format: 'Format',
   fpNotFoundError:
     'The LoRaWAN version <code>{lorawanVersion}</code> does not support the <code>{freqPlan}</code> frequency plan. Please choose a different MAC version or frequency plan.',
diff --git a/pkg/webui/locales/en.json b/pkg/webui/locales/en.json
index 9d6ee65f21..1ef665ddf9 100644
--- a/pkg/webui/locales/en.json
+++ b/pkg/webui/locales/en.json
@@ -614,21 +614,16 @@
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteSuccess": "WiFi profile deleted",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteFail": "There was an error and the WiFi profile could not be deleted",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteModalMessage": "The profile will not be applicable to gateways anymore and gateways using this profile might lose connectivity. Please make sure to update the gateway settings before deleting this profile.",
-  "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-claim-form-section.index.claimWarning": "We detected a Managed gateway. To claim this gateway with a subscription, use the owner token printed on the gateway, or add it to your Gateway Fleet using your <Link>fleet owner token.</Link>",
-  "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-claim-form-section.index.fleet": "Fleet",
+  "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-claim-form-section.index.claimWarning": "We detected that your gateway is a <strong>Managed Gateway</strong>. To claim this gateway, please use the owner token printed on the inside of the mounting lid or scan the QR code to claim instantly.",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.requireAuthenticatedConnectionDescription": "Select which information can be seen by other network participants, including {packetBrokerURL}",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.shareGatewayInfoDescription": "Choose this option eg. if your gateway is powered by {loraBasicStationURL}",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.validation-schema.validateEntry": "There must be at least one selected frequency plan ID.",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.continue": "To continue, please confirm the Gateway EUI so we can determine onboarding options",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.emtyEui": "Continue without EUI",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.noEui": "No gateway EUI",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.addFleet": "Add to Fleet",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.fleetToken": "Fleet owner token",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.addToFleetTooltip": "You are registering a Managed gateway. If you want to add it to an existing fleet, click here.",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.hasGatewayQR": "Does your gateway have a LoRaWAN® Gateway Identification QR Code? Scan it to speed up onboarding.",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.gatewayGuide": "Gateway registration help",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.invalidQRCode": "Invalid QR code data. Please note that only TTIGPRO1 Gateway Identification QR Code can be scanned. Some gateways have unrelated QR codes printed on them that cannot be used.",
-  "console.containers.gateway-onboarding-form.qr-scan-section.index.gatewayOwnerToken": "Gateway owner token",
   "console.containers.gateway-overview-header.index.addBookmarkFail": "There was an error and the gateway could not be bookmarked",
   "console.containers.gateway-overview-header.index.duplicateGateway": "Duplicate gateway",
   "console.containers.gateway-overview-header.index.removeBookmarkFail": "There was an error and the gateway could not be removed from bookmarks",
@@ -1088,12 +1083,12 @@
   "lib.errors.status-code-messages.503": "Service unavailable",
   "lib.errors.status-code-messages.504": "Gateway timeout",
   "lib.errors.utils.notFound": "Gateway doesn't exist. Please confirm that the gateway EUI is correct.",
-  "lib.errors.utils.subscriptionDetached": "The gateway billing is detached. Scan the QR code on the gateway to open the Gateway Status page.",
-  "lib.errors.utils.subscriptionSuspended": "Your gateway billing is suspended. Scan the QR code on the gateway to open the Gateway Status page.",
-  "lib.errors.utils.subscriptionUnknown": "The gateway billing is not set up yet. Scan the QR code on the gateway to open the Gateway Status page.",
-  "lib.errors.utils.noSlotsAvailable": "There are no available Gateway Licenses for this gateway. Scan the QR code on the gateway to open the Gateway Status page.",
+  "lib.errors.utils.subscriptionDetached": "The gateway billing is detached. Scan the QR code on the gateway to open the <link>Gateway Status page.</link>",
+  "lib.errors.utils.subscriptionSuspended": "Your gateway billing is suspended. Scan the QR code on the gateway to open the <link>Gateway Status page.</link>",
+  "lib.errors.utils.subscriptionUnknown": "The gateway billing is not set up yet. Scan the QR code on the gateway to open the <link>Gateway Status page.</link>",
+  "lib.errors.utils.noSlotsAvailable": "There are no available Gateway Licenses for this gateway. Scan the QR code on the gateway to open the <link>Gateway Status page.</link>",
   "lib.errors.utils.permissionDenied": "The owner token is invalid.",
-  "lib.errors.utils.fleetIdMismatch": "The gateway EUI matches a Gateway License, but the fleet ID does not match. Scan the QR code on the gateway to open the Gateway Status page.",
+  "lib.errors.utils.fleetIdMismatch": "The gateway EUI matches a Gateway License, but the fleet ID does not match. Scan the QR code on the gateway to open the <link>Gateway Status page.</link>",
   "lib.field-description-messages.idLocation": "Enter a value using lowercase letters, numbers, and dashes. You can choose this freely.",
   "lib.field-description-messages.freqPlanDescription": "A frequency plan defines data rates that your end device or gateway is setup to use. It is important that gateways and end devices within reach use the same frequency plan to be able to communicate.",
   "lib.field-description-messages.freqPlanLocation": "Your end device or gateway manufacturer should provide information about the applicable frequency plan for a particular device. In some cases they are printed on the device itself but they should always be in the hardware manual or data sheet.",
@@ -1446,8 +1441,6 @@
   "lib.shared-messages.fCnt": "FCnt",
   "lib.shared-messages.fetching": "Fetching data…",
   "lib.shared-messages.firmwareVersion": "Firmware version",
-  "lib.shared-messages.fleetInfo": "Adding a gateway to a Fleet will claim the gateway using an available Slot. <Link>Read docs.</Link>",
-  "lib.shared-messages.fleetTokenInfo": "Log in to <Link>your billing account.</Link> Select the fleet and copy the token.",
   "lib.shared-messages.format": "Format",
   "lib.shared-messages.fpNotFoundError": "The LoRaWAN version <code>{lorawanVersion}</code> does not support the <code>{freqPlan}</code> frequency plan. Please choose a different MAC version or frequency plan.",
   "lib.shared-messages.fPort": "FPort",
diff --git a/pkg/webui/locales/ja.json b/pkg/webui/locales/ja.json
index 90881a1b69..b33adc90d3 100644
--- a/pkg/webui/locales/ja.json
+++ b/pkg/webui/locales/ja.json
@@ -615,20 +615,15 @@
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteFail": "",
   "console.containers.gateway-managed-gateway.wifi-profiles.overview.deleteModalMessage": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-claim-form-section.index.claimWarning": "",
-  "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-claim-form-section.index.fleet": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.requireAuthenticatedConnectionDescription": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.index.shareGatewayInfoDescription": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.gateway-registration-form-section.validation-schema.validateEntry": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.continue": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.emtyEui": "",
   "console.containers.gateway-onboarding-form.gateway-provisioning-form.index.noEui": "",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.addFleet": "",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.fleetToken": "",
-  "console.containers.gateway-onboarding-form.qr-scan-section.fleets-scan.addToFleetTooltip": "",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.hasGatewayQR": "",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.gatewayGuide": "",
   "console.containers.gateway-onboarding-form.qr-scan-section.index.invalidQRCode": "",
-  "console.containers.gateway-onboarding-form.qr-scan-section.index.gatewayOwnerToken": "",
   "console.containers.gateway-overview-header.index.addBookmarkFail": "",
   "console.containers.gateway-overview-header.index.duplicateGateway": "",
   "console.containers.gateway-overview-header.index.removeBookmarkFail": "",
@@ -1446,8 +1441,6 @@
   "lib.shared-messages.fCnt": "",
   "lib.shared-messages.fetching": "データの取得...",
   "lib.shared-messages.firmwareVersion": "ファームウェアバージョン",
-  "lib.shared-messages.fleetInfo": "",
-  "lib.shared-messages.fleetTokenInfo": "",
   "lib.shared-messages.format": "フォーマット",
   "lib.shared-messages.fpNotFoundError": "指定された周波数プランは見つかりませんでした",
   "lib.shared-messages.fPort": "",