diff --git a/docs/manual/config/config_file_reference.rst b/docs/manual/config/config_file_reference.rst
index 60053b42f8..ed87fabfa6 100644
--- a/docs/manual/config/config_file_reference.rst
+++ b/docs/manual/config/config_file_reference.rst
@@ -202,9 +202,9 @@ Text
 This element specifies the DDSI participant index used by this instance of the Cyclone DDS service for discovery purposes. Only one such participant id is used, independent of the number of actual DomainParticipants on the node. It is either:
  * auto: which will attempt to automatically determine an available participant index (see also Discovery/MaxAutoParticipantIndex), or
 
- * a non-negative integer less than 120, or
+ * a non-negative integer, or
 
- * none:, which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.
+ * none: which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.
 
 
 The default value is: ``none``
@@ -2656,8 +2656,8 @@ The default value is: ``none``
 ..
    generated from ddsi_config.h[7a2ea305c6a2eab7fe285734641fe60da41874b6] 
    generated from ddsi__cfgunits.h[bd22f0c0ed210501d0ecd3b07c992eca549ef5aa] 
-   generated from ddsi__cfgelems.h[0d6b51026a1233c9516629caf2de8748b027bc20] 
-   generated from ddsi_config.c[efeae198a5e12ca8977a655216470564b5c44b64] 
+   generated from ddsi__cfgelems.h[bf5f0d9b9265e4b6f3f61e7624325af68eb276bf] 
+   generated from ddsi_config.c[2d8c4ee6633a21fb69c3f7cb0bf685c1ca9e5132] 
    generated from _confgen.h[e32eabfc35e9f3a7dcb63b19ed148c0d17c6e5fc] 
    generated from _confgen.c[237308acd53897a34e8c643e16e05a61d73ffd65] 
    generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] 
diff --git a/docs/manual/options.md b/docs/manual/options.md
index ef6b32ae13..a7f188d813 100644
--- a/docs/manual/options.md
+++ b/docs/manual/options.md
@@ -129,9 +129,9 @@ Text
 This element specifies the DDSI participant index used by this instance of the Cyclone DDS service for discovery purposes. Only one such participant id is used, independent of the number of actual DomainParticipants on the node. It is either:
  * auto: which will attempt to automatically determine an available participant index (see also Discovery/MaxAutoParticipantIndex), or
 
- * a non-negative integer less than 120, or
+ * a non-negative integer, or
 
- * none:, which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.
+ * none: which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.
 
 The default value is: `none`
 
@@ -1856,8 +1856,8 @@ The categorisation of tracing output is incomplete and hence most of the verbosi
 The default value is: `none`
 <!--- generated from ddsi_config.h[7a2ea305c6a2eab7fe285734641fe60da41874b6] -->
 <!--- generated from ddsi__cfgunits.h[bd22f0c0ed210501d0ecd3b07c992eca549ef5aa] -->
-<!--- generated from ddsi__cfgelems.h[0d6b51026a1233c9516629caf2de8748b027bc20] -->
-<!--- generated from ddsi_config.c[efeae198a5e12ca8977a655216470564b5c44b64] -->
+<!--- generated from ddsi__cfgelems.h[bf5f0d9b9265e4b6f3f61e7624325af68eb276bf] -->
+<!--- generated from ddsi_config.c[2d8c4ee6633a21fb69c3f7cb0bf685c1ca9e5132] -->
 <!--- generated from _confgen.h[e32eabfc35e9f3a7dcb63b19ed148c0d17c6e5fc] -->
 <!--- generated from _confgen.c[237308acd53897a34e8c643e16e05a61d73ffd65] -->
 <!--- generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] -->
diff --git a/etc/cyclonedds.rnc b/etc/cyclonedds.rnc
index 34c48d70b8..fb18706c45 100644
--- a/etc/cyclonedds.rnc
+++ b/etc/cyclonedds.rnc
@@ -91,8 +91,8 @@ CycloneDDS configuration""" ] ]
         & [ a:documentation [ xml:lang="en" """
 <p>This element specifies the DDSI participant index used by this instance of the Cyclone DDS service for discovery purposes. Only one such participant id is used, independent of the number of actual DomainParticipants on the node. It is either:</p>
 <ul><li><i>auto</i>: which will attempt to automatically determine an available participant index (see also Discovery/MaxAutoParticipantIndex), or</li>
-<li>a non-negative integer less than 120, or</li>
-<li><i>none</i>:, which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.</li></ul>
+<li>a non-negative integer, or</li>
+<li><i>none</i>: which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.</li></ul>
 <p>The default value is: <code>none</code></p>""" ] ]
         element ParticipantIndex {
           text
@@ -1291,8 +1291,8 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==<br>
 }
 # generated from ddsi_config.h[7a2ea305c6a2eab7fe285734641fe60da41874b6] 
 # generated from ddsi__cfgunits.h[bd22f0c0ed210501d0ecd3b07c992eca549ef5aa] 
-# generated from ddsi__cfgelems.h[0d6b51026a1233c9516629caf2de8748b027bc20] 
-# generated from ddsi_config.c[efeae198a5e12ca8977a655216470564b5c44b64] 
+# generated from ddsi__cfgelems.h[bf5f0d9b9265e4b6f3f61e7624325af68eb276bf] 
+# generated from ddsi_config.c[2d8c4ee6633a21fb69c3f7cb0bf685c1ca9e5132] 
 # generated from _confgen.h[e32eabfc35e9f3a7dcb63b19ed148c0d17c6e5fc] 
 # generated from _confgen.c[237308acd53897a34e8c643e16e05a61d73ffd65] 
 # generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] 
diff --git a/etc/cyclonedds.xsd b/etc/cyclonedds.xsd
index e409e62d4f..f68074a076 100644
--- a/etc/cyclonedds.xsd
+++ b/etc/cyclonedds.xsd
@@ -174,8 +174,8 @@ CycloneDDS configuration</xs:documentation>
       <xs:documentation>
 &lt;p&gt;This element specifies the DDSI participant index used by this instance of the Cyclone DDS service for discovery purposes. Only one such participant id is used, independent of the number of actual DomainParticipants on the node. It is either:&lt;/p&gt;
 &lt;ul&gt;&lt;li&gt;&lt;i&gt;auto&lt;/i&gt;: which will attempt to automatically determine an available participant index (see also Discovery/MaxAutoParticipantIndex), or&lt;/li&gt;
-&lt;li&gt;a non-negative integer less than 120, or&lt;/li&gt;
-&lt;li&gt;&lt;i&gt;none&lt;/i&gt;:, which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.&lt;/li&gt;&lt;/ul&gt;
+&lt;li&gt;a non-negative integer, or&lt;/li&gt;
+&lt;li&gt;&lt;i&gt;none&lt;/i&gt;: which causes it to use arbitrary port numbers for unicast sockets which entirely removes the constraints on the participant index but makes unicast discovery impossible.&lt;/li&gt;&lt;/ul&gt;
 &lt;p&gt;The default value is: &lt;code&gt;none&lt;/code&gt;&lt;/p&gt;</xs:documentation>
     </xs:annotation>
   </xs:element>
@@ -1949,8 +1949,8 @@ MIIEpAIBAAKCAQEA3HIh...AOBaaqSV37XBUJg==&lt;br&gt;
 </xs:schema>
 <!--- generated from ddsi_config.h[7a2ea305c6a2eab7fe285734641fe60da41874b6] -->
 <!--- generated from ddsi__cfgunits.h[bd22f0c0ed210501d0ecd3b07c992eca549ef5aa] -->
-<!--- generated from ddsi__cfgelems.h[0d6b51026a1233c9516629caf2de8748b027bc20] -->
-<!--- generated from ddsi_config.c[efeae198a5e12ca8977a655216470564b5c44b64] -->
+<!--- generated from ddsi__cfgelems.h[bf5f0d9b9265e4b6f3f61e7624325af68eb276bf] -->
+<!--- generated from ddsi_config.c[2d8c4ee6633a21fb69c3f7cb0bf685c1ca9e5132] -->
 <!--- generated from _confgen.h[e32eabfc35e9f3a7dcb63b19ed148c0d17c6e5fc] -->
 <!--- generated from _confgen.c[237308acd53897a34e8c643e16e05a61d73ffd65] -->
 <!--- generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] -->
diff --git a/src/core/ddsi/defconfig.c b/src/core/ddsi/defconfig.c
index dd8b1ad73e..677dfa4e7f 100644
--- a/src/core/ddsi/defconfig.c
+++ b/src/core/ddsi/defconfig.c
@@ -102,8 +102,8 @@ void ddsi_config_init_default (struct ddsi_config *cfg)
 }
 /* generated from ddsi_config.h[7a2ea305c6a2eab7fe285734641fe60da41874b6] */
 /* generated from ddsi__cfgunits.h[bd22f0c0ed210501d0ecd3b07c992eca549ef5aa] */
-/* generated from ddsi__cfgelems.h[0d6b51026a1233c9516629caf2de8748b027bc20] */
-/* generated from ddsi_config.c[efeae198a5e12ca8977a655216470564b5c44b64] */
+/* generated from ddsi__cfgelems.h[bf5f0d9b9265e4b6f3f61e7624325af68eb276bf] */
+/* generated from ddsi_config.c[2d8c4ee6633a21fb69c3f7cb0bf685c1ca9e5132] */
 /* generated from _confgen.h[e32eabfc35e9f3a7dcb63b19ed148c0d17c6e5fc] */
 /* generated from _confgen.c[237308acd53897a34e8c643e16e05a61d73ffd65] */
 /* generated from generate_rnc.c[b50e4b7ab1d04b2bc1d361a0811247c337b74934] */
diff --git a/src/core/ddsi/src/ddsi__cfgelems.h b/src/core/ddsi/src/ddsi__cfgelems.h
index f164c05d8a..394f2c8bbb 100644
--- a/src/core/ddsi/src/ddsi__cfgelems.h
+++ b/src/core/ddsi/src/ddsi__cfgelems.h
@@ -1878,8 +1878,8 @@ static struct cfgelem discovery_cfgelems[] = {
       "<ul><li><i>auto</i>: which will attempt to automatically determine an "
       "available participant index "
       "(see also Discovery/MaxAutoParticipantIndex), or</li>\n"
-      "<li>a non-negative integer less than 120, or</li>\n"
-      "<li><i>none</i>:, which causes it to use arbitrary port numbers for "
+      "<li>a non-negative integer, or</li>\n"
+      "<li><i>none</i>: which causes it to use arbitrary port numbers for "
       "unicast sockets which entirely removes the constraints on the "
       "participant index but makes unicast discovery impossible.</li></ul>"
     )),
diff --git a/src/core/ddsi/src/ddsi_config.c b/src/core/ddsi/src/ddsi_config.c
index 52c9d624b9..023d9e1326 100644
--- a/src/core/ddsi/src/ddsi_config.c
+++ b/src/core/ddsi/src/ddsi_config.c
@@ -1566,7 +1566,7 @@ static enum update_result uf_participantIndex (struct ddsi_cfgst *cfgst, void *p
     *elem = DDSI_PARTICIPANT_INDEX_NONE;
     return URES_SUCCESS;
   } else {
-    return uf_int_min_max (cfgst, parent, cfgelem, first, value, 0, 120);
+    return uf_natint (cfgst, parent, cfgelem, first, value);
   }
 }