diff --git a/charts/oai-smf/values.yaml b/charts/oai-smf/values.yaml
index bf7cb1ac7a9f88c144b27c584a547f372d41cba6..ed4ac8df4dff2ec94bd6b9af001b5cd2953a9c56 100644
--- a/charts/oai-smf/values.yaml
+++ b/charts/oai-smf/values.yaml
@@ -72,7 +72,7 @@ config:
   amfFqdn: "oai-amf-svc" # configure if NRF is not used
   udmIpv4Address: "127.0.0.1" # configure if UDM is used
   udmPort: "80" # configure if UDM is used
-  udmApiVersion: "v1" # configure if UDM is used
+  udmApiVersion: "v2" # configure if UDM is used
   udmFqdn: "localhost" # configure if UDM is used
   nrfIpv4Address: "127.0.0.1" # configure if NRF can only be reached using ip-address
   nrfPort : "80" 
diff --git a/ci-scripts/charts/oai-smf/values.yaml b/ci-scripts/charts/oai-smf/values.yaml
index f11309e332a300de27532de0e221a3a7d7d1db26..d7a6b0f4c77fcb6be258e3989e900062e75560f9 100644
--- a/ci-scripts/charts/oai-smf/values.yaml
+++ b/ci-scripts/charts/oai-smf/values.yaml
@@ -71,7 +71,7 @@ config:
   amfFqdn: "oai-smf-svc"
   udmIpv4Address: "127.0.0.1"
   udmPort: "80"
-  udmApiVersion: "v1"
+  udmApiVersion: "v2"
   udmFqdn: "localhost"
   nrfIpv4Address: "127.0.0.1"
   nrfPort : "80"
diff --git a/ci-scripts/charts/oai-udr/values.yaml b/ci-scripts/charts/oai-udr/values.yaml
index a3adb8862f2ff2ba136aca01e8ee12531875c1ce..3c307ec880858a32424b64178c777f6068742700 100644
--- a/ci-scripts/charts/oai-udr/values.yaml
+++ b/ci-scripts/charts/oai-udr/values.yaml
@@ -59,7 +59,7 @@ config:
   udrInterfaceNameForNudr: "eth0"
   udrInterfaceHttp1PortForNudr: "80"
   udrInterfaceHttp2PortForNudr: "8080"
-  udrApiVersion: "v1"
+  udrApiVersion: "v2"
   mySqlServer: "mysql"
   mySqlUser: "root"
   mySqlPass: "linux"
diff --git a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
index e27c3160b262767879c2b78f67682a1f78c4204c..47d0e1b0e066729f68c5148953b9e34df5b066c9 100644
--- a/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
+++ b/ci-scripts/dsTesterDockerCompose/docker-compose.tplt
@@ -40,7 +40,7 @@ services:
             - UDR_INTERFACE_NAME_FOR_NUDR=eth0
             - UDR_INTERFACE_PORT_FOR_NUDR=80
             - UDR_INTERFACE_HTTP2_PORT_FOR_NUDR=8080
-            - UDR_API_VERSION=v1
+            - UDR_API_VERSION=v2
             - MYSQL_IPV4_ADDRESS=192.168.61.194
             - MYSQL_USER=test
             - MYSQL_PASS=test
@@ -270,7 +270,7 @@ services:
             - AMF_FQDN=cicd_oai_amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.61.198
             - UPF_FQDN_0=cicd_oai_upf
diff --git a/docker-compose/docker-compose-no-nrf.yaml b/docker-compose/docker-compose-no-nrf.yaml
index 995fc21e80a3ef5fbd234df2964d6b67ea635464..f06d2501c5a619842609077e71293aa98aeedfc9 100644
--- a/docker-compose/docker-compose-no-nrf.yaml
+++ b/docker-compose/docker-compose-no-nrf.yaml
@@ -105,7 +105,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-upf
diff --git a/docker-compose/docker-compose-no-privilege.yaml b/docker-compose/docker-compose-no-privilege.yaml
index 897df5f0b7a351c12bc74029d4831be98986ec80..5a744efd628e9de98cd32d25908fdf0844c1ea01 100644
--- a/docker-compose/docker-compose-no-privilege.yaml
+++ b/docker-compose/docker-compose-no-privilege.yaml
@@ -125,7 +125,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-spgwu
diff --git a/docker-compose/docker-compose-vpp-upf.yaml b/docker-compose/docker-compose-vpp-upf.yaml
index 6bf920a9d475c652e744957e3b1e0d0003028305..a6ad717af858c114672ada4301e005ae241b7da6 100644
--- a/docker-compose/docker-compose-vpp-upf.yaml
+++ b/docker-compose/docker-compose-vpp-upf.yaml
@@ -100,7 +100,7 @@ services:
             - AMF_API_VERSION=v1
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UPF_IPV4_ADDRESS=192.168.71.202
             - NRF_IPV4_ADDRESS=0.0.0.0
             - NRF_PORT=80
diff --git a/docker-compose/docker-compose.yaml b/docker-compose/docker-compose.yaml
index 0d9c0cee605bf68ced1e32b2b47634e32a6d7103..ffed53ee17ff3b611b6ca21575f2dcd46ba09288 100644
--- a/docker-compose/docker-compose.yaml
+++ b/docker-compose/docker-compose.yaml
@@ -125,7 +125,7 @@ services:
             - AMF_FQDN=oai-amf
             - UDM_IPV4_ADDRESS=127.0.0.1
             - UDM_PORT=80
-            - UDM_API_VERSION=v1
+            - UDM_API_VERSION=v2
             - UDM_FQDN=localhost
             - UPF_IPV4_ADDRESS=192.168.70.134
             - UPF_FQDN_0=oai-spgwu