diff --git a/src/datasource/Manager.js b/src/datasource/Manager.js
index 15de923a5b3f..ec090b590226 100644
--- a/src/datasource/Manager.js
+++ b/src/datasource/Manager.js
@@ -747,8 +747,17 @@ export class DatasourceManager {
     if (wmtsUrl) {
       options.wmtsUrl = wmtsUrl;
     }
-    if (ogcServerType === ServerType.ARCGIS && this.gmfDatasourceOptions.arcgisWMSInfoFormat) {
-      options.wmsInfoFormat = this.gmfDatasourceOptions.arcgisWMSInfoFormat;
+    if (ogcServerType === ServerType.ARCGIS) {
+      if (
+        this.gmfDatasourceOptions.ogcServersSpecific &&
+        this.gmfDatasourceOptions.ogcServersSpecific[this.ogcServerName] &&
+        this.gmfDatasourceOptions.ogcServersSpecific[this.ogcServerName].arcgisWMSInfoFormat
+      ) {
+        options.wmsInfoFormat =
+          this.gmfDatasourceOptions.ogcServersSpecific[this.ogcServerName].arcgisWMSInfoFormat;
+      } else if (this.gmfDatasourceOptions.arcgisWMSInfoFormat) {
+        options.wmsInfoFormat = this.gmfDatasourceOptions.arcgisWMSInfoFormat;
+      }
     }
     // Create the data source and add it to the cache
     this.dataSourcesCache_[id] = new GmfDatasourceOGC(options);
diff --git a/src/options.js b/src/options.js
index 93a6988eb8e5..f5979ab5fea9 100644
--- a/src/options.js
+++ b/src/options.js
@@ -908,9 +908,15 @@ export function buildStyle(styleDescriptor) {
  * @typedef {string} gmfCustomStylesheetUrl
  */
 
+/**
+ * @typedef {Object} ogcServerDatasourceOptions
+ * @property {string} arcgisWMSInfoFormat The WMS info format to be used with Arcgis OGC server.
+ */
+
 /**
  * @typedef {Object} gmfDatasourceOptions
  * @property {string} arcgisWMSInfoFormat The WMS info format to be used with Arcgis OGC server.
+ * @property {Object<string, ogcServerDatasourceOptions>} ogcServerSpecific The OGC server specific options.
  */
 
 export default null;
diff --git a/srcapi/store/config.ts b/srcapi/store/config.ts
index e71df01ff115..61a5e89384a8 100644
--- a/srcapi/store/config.ts
+++ b/srcapi/store/config.ts
@@ -1382,12 +1382,20 @@ export type gmfCustomCSS = {
  */
 export type pytreeLidarprofileJsonUrl = string;
 
+export type ogcServerDatasourceOptions = {
+  /**
+   * The WMS info format to be used with Arcgis OGC server.
+   */
+  arcgisWMSInfoFormat: string;
+};
 export type gmfDatasourceOptions = {
   /**
    * The WMS info format to be used with Arcgis OGC server.
    */
   arcgisWMSInfoFormat: string;
+  ogcServerSpecific: {[x: string]: ogcServerDatasourceOptions};
 };
+
 /**
  * The full configuration
  */