diff --git a/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx b/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
index 882951dabd5..4639f65e2da 100644
--- a/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
+++ b/config-ui/src/plugins/components/connection-form/fields/endpoint.tsx
@@ -29,6 +29,7 @@ interface Props {
   disabled?: boolean;
   name: string;
   multipleVersions?: Record<VersionType, string>;
+  cloudName?: string;
   initialValue: string;
   value: string;
   error: string;
@@ -41,6 +42,7 @@ export const ConnectionEndpoint = ({
   disabled = false,
   name,
   multipleVersions,
+  cloudName,
   initialValue,
   value,
   setValue,
@@ -79,7 +81,7 @@ export const ConnectionEndpoint = ({
       <>
         <Block title={`${name} Version`} required>
           <Radio.Group value={version} onChange={handleChange}>
-            <Radio value="cloud">{name} Cloud</Radio>
+            <Radio value="cloud">{cloudName ? cloudName : `${name} Cloud`}</Radio>
             <Radio value="server" disabled={!multipleVersions.server}>
               {name} Server {multipleVersions.server ? multipleVersions.server : '(to be supported)'}
             </Radio>
diff --git a/config-ui/src/plugins/register/sonarqube/config.tsx b/config-ui/src/plugins/register/sonarqube/config.tsx
index 7c8ab3a68fd..60d1d483749 100644
--- a/config-ui/src/plugins/register/sonarqube/config.tsx
+++ b/config-ui/src/plugins/register/sonarqube/config.tsx
@@ -41,7 +41,8 @@ export const SonarQubeConfig: IPluginConfig = {
           cloud: 'https://sonarcloud.io/api/',
           server: ' ',
         },
-        subLabel: 'If you are using SonarCloud, the endpoint URL will be set to `https://sonarcloud.io/api/`.',
+        cloudName: 'SonarCloud',
+        subLabel: 'The URL should be `http://<sonarqube-host>:<port>/api/`',
       },
       ({ type, initialValues, values, errors, setValues, setErrors }: any) => (
         <Organization