diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
index 03b62a0bf7332..0a41bfbf86dcc 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.constants.ts
@@ -5,15 +5,15 @@ import { TrackingOptions } from '../AddRemoteInstance.types';
 
 import { MetricsParameters, Schema } from './FormParts.types';
 
-export const rdsTrackingOptions = [
+export const trackingOptions = [
   { value: TrackingOptions.none, label: Messages.form.trackingOptions.none },
   { value: TrackingOptions.pgStatements, label: Messages.form.trackingOptions.pgStatements },
+  { value: TrackingOptions.pgMonitor, label: Messages.form.trackingOptions.pgMonitor },
 ];
 
-export const trackingOptions = [
+export const rdsTrackingOptions = [
   { value: TrackingOptions.none, label: Messages.form.trackingOptions.none },
   { value: TrackingOptions.pgStatements, label: Messages.form.trackingOptions.pgStatements },
-  { value: TrackingOptions.pgMonitor, label: Messages.form.trackingOptions.pgMonitor },
 ];
 
 export const schemaOptions: SelectableValue[] = [
diff --git a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.test.tsx b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.test.tsx
index 99b8c79a8ce1d..7af1b758c480e 100644
--- a/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.test.tsx
+++ b/public/app/percona/add-instance/components/AddRemoteInstance/FormParts/FormParts.test.tsx
@@ -7,7 +7,7 @@ import { Databases } from 'app/percona/shared/core';
 
 import { AdditionalOptionsFormPart, getAdditionalOptions } from './AdditionalOptions/AdditionalOptions';
 import { ExternalServiceConnectionDetails } from './ExternalServiceConnectionDetails/ExternalServiceConnectionDetails';
-import { trackingOptions } from './FormParts.constants';
+import { trackingOptions, rdsTrackingOptions } from './FormParts.constants';
 import { LabelsFormPart } from './Labels/Labels';
 import { MainDetailsFormPart } from './MainDetails/MainDetails';
 
@@ -197,7 +197,7 @@ describe('getAdditionalOptions ::', () => {
     );
     const fields = container.querySelectorAll('input');
     const trakingFields = screen.getAllByTestId('tracking-radio-button');
-    expect(trakingFields.length).toBe(trackingOptions.length);
-    expect(fields.length).toBe(14);
+    expect(trakingFields.length).toBe(rdsTrackingOptions.length);
+    expect(fields.length).toBe(13);
   });
 });