diff --git a/docs/metrics.md b/docs/metrics.md
index b999135c0..fc312d89d 100644
--- a/docs/metrics.md
+++ b/docs/metrics.md
@@ -11,11 +11,13 @@ The `MM_METRICS` env variable can be used to configure or disable how metrics ar
 
 |      	       |                                       Purpose                                                                          	                                        |          Applies to                    	           |              Default               |
 |:------------:|:---------------------------------------------------------------------------------------------------------------------------------------------------------------:|:--------------------------------------------------:|:----------------------------------:|
-| `port`     	 |  Port on which to send or serve metrics                                                                                                                     	   | statsd (UDP push), prometheus (HTTP/HTTPS serve) 	 | 8126 (statsd), 2112 (prometheus) 	 |
-| `fq_names` 	 |  Whether to use fully-qualified method names in request metrics                                                                                             	   | statsd, prometheus                               	 | false                            	 |
-| `legacy`   	 | Whether to publish legacy flavour (non-Sysdig) statsd metrics. Note that the legacy metrics are equivalent but have different names to those in the table below | statsd                                           	 | false                            	 |
-| `scheme`   	 |  Protocol scheme to use for Prometheus metrics, can be http or https                                                                                        	   | prometheus                                       	 | https                            	 |
+| `port`     	 |  Port on which to send or serve metrics                                                                                                                     	   | statsd (UDP push), prometheus (HTTP/HTTPS serve) 	 | `8126` (statsd), `2112` (prometheus)|
+| `fq_names` 	 |  Whether to use fully-qualified method names in request metrics                                                                                             	   | statsd, prometheus                               	 | `false`                          	 |
+| `legacy`   	 | Whether to publish legacy flavour (non-Sysdig) statsd metrics. Note that the legacy metrics are equivalent but have different names to those in the table below | statsd                                           	 | `false`                          	 |
+| `scheme`   	 |  Protocol scheme to use for Prometheus metrics, can be `http` or `https`                                                                                        	   | prometheus                                       	 | `https`                          	 |
+|`per_model_metrics`|Whether to include the `modelId` and `vModelId` labels in applicable published metrics|prometheus|`false` (*)|
 
+(*) In versions of ModelMesh between Sep 5 2023 and Nov 16 2023, the default value of `per_model_metrics` was (unintentionally) `true`.
 
 ### Capturing Prometheus metrics
 
@@ -61,4 +63,4 @@ prometheus.io/scrape: "true"
 | modelmesh_instance_capacity_bytes          	 | Gauge  	 | Pod           	 | Effective model capacity of pod excluding unload buffer                  	 |
 | modelmesh_instance_used_bytes              	 | Gauge  	 | Pod           	 | Amount of capacity currently in use by loaded models                     	 |
 | modelmesh_instance_used_bps                	 | Gauge  	 | Pod           	 | Amount of capacity used in basis points (100ths of percent)              	 |
-| modelmesh_instance_models_total            	 | Gauge  	 | Pod           	 | Number of model copies loaded in pod                                     	 |
\ No newline at end of file
+| modelmesh_instance_models_total            	 | Gauge  	 | Pod           	 | Number of model copies loaded in pod                                     	 |
diff --git a/pom.xml b/pom.xml
index 07e177bc4..234060f45 100644
--- a/pom.xml
+++ b/pom.xml
@@ -74,7 +74,7 @@
     <!-- Care must be taken when updating the prometheus client lib version
          since we have some custom optimized extensions to this -->
     <prometheus-version>0.9.0</prometheus-version>
-    <bouncycastle-version>1.70</bouncycastle-version>
+    <bouncycastle-version>1.74</bouncycastle-version>
     <junit-version>5.10.0</junit-version>
 
     <dockerhome>${project.build.directory}/dockerhome</dockerhome>
@@ -450,7 +450,7 @@
        generate a self-signed server certificate -->
     <dependency>
       <groupId>org.bouncycastle</groupId>
-      <artifactId>bcpkix-jdk15on</artifactId>
+      <artifactId>bcpkix-jdk18on</artifactId>
       <version>${bouncycastle-version}</version>
     </dependency>