diff --git a/ampolicy/api_default.go b/ampolicy/api_default.go
index 2877b219..68881b3d 100644
--- a/ampolicy/api_default.go
+++ b/ampolicy/api_default.go
@@ -17,9 +17,9 @@ package ampolicy
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/pcf/util"
diff --git a/bdtpolicy/api_bdt_policies_collection_routers.go b/bdtpolicy/api_bdt_policies_collection_routers.go
index a158cc3d..4b455523 100644
--- a/bdtpolicy/api_bdt_policies_collection_routers.go
+++ b/bdtpolicy/api_bdt_policies_collection_routers.go
@@ -17,9 +17,9 @@ package bdtpolicy
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/bdtpolicy/api_individual_bdt_policy_document_routers.go b/bdtpolicy/api_individual_bdt_policy_document_routers.go
index a17e7edc..3576257d 100644
--- a/bdtpolicy/api_individual_bdt_policy_document_routers.go
+++ b/bdtpolicy/api_individual_bdt_policy_document_routers.go
@@ -17,9 +17,9 @@ package bdtpolicy
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/callback/api_nf_subscribe_notify.go b/callback/api_nf_subscribe_notify.go
index ab764432..e546cb0f 100644
--- a/callback/api_nf_subscribe_notify.go
+++ b/callback/api_nf_subscribe_notify.go
@@ -10,9 +10,9 @@ package callback
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/consumer/communication.go b/consumer/communication.go
index 7ee8e649..50600964 100644
--- a/consumer/communication.go
+++ b/consumer/communication.go
@@ -11,8 +11,8 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	pcf_context "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/util"
diff --git a/consumer/nf_discovery.go b/consumer/nf_discovery.go
index 84666278..04a5ae6d 100644
--- a/consumer/nf_discovery.go
+++ b/consumer/nf_discovery.go
@@ -11,10 +11,10 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac/Nnrf_NFDiscovery"
+	"github.com/5GC-DEV/openapi-cdac/models"
+	nrfCache "github.com/5GC-DEV/openapi-cdac/nrfcache"
 	"github.com/antihax/optional"
-	"github.com/omec-project/openapi/Nnrf_NFDiscovery"
-	"github.com/omec-project/openapi/models"
-	nrfCache "github.com/omec-project/openapi/nrfcache"
 	pcfContext "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/util"
diff --git a/consumer/nf_management.go b/consumer/nf_management.go
index 107a8dd4..38cc7e77 100644
--- a/consumer/nf_management.go
+++ b/consumer/nf_management.go
@@ -13,9 +13,9 @@ import (
 	"strings"
 	"time"
 
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/Nnrf_NFManagement"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/Nnrf_NFManagement"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	pcfContext "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 )
diff --git a/context/context.go b/context/context.go
index bff9b868..584c725b 100644
--- a/context/context.go
+++ b/context/context.go
@@ -14,8 +14,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/factory"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/util/idgenerator"
diff --git a/context/ue.go b/context/ue.go
index 3406eaf0..ed938b4f 100644
--- a/context/ue.go
+++ b/context/ue.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/util/idgenerator"
 )
diff --git a/factory/config.go b/factory/config.go
index ba268815..af272c6a 100644
--- a/factory/config.go
+++ b/factory/config.go
@@ -11,7 +11,7 @@
 package factory
 
 import (
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/util/logger"
 )
 
diff --git a/go.mod b/go.mod
index f46c3419..da09754a 100644
--- a/go.mod
+++ b/go.mod
@@ -5,13 +5,13 @@ go 1.24.0
 require (
 	github.com/5GC-DEV/config5g-cdac v0.2.1
 	github.com/5GC-DEV/event v0.0.0-20250920143456-3d7f9c51c82a
+	github.com/5GC-DEV/openapi-cdac v0.4.1
 	github.com/antihax/optional v1.0.0
 	github.com/cydev/zero v0.0.0-20160322155811-4a4535dd56e7
 	github.com/gin-contrib/cors v1.7.5
 	github.com/gin-gonic/gin v1.10.1
 	github.com/google/uuid v1.6.0
 	github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-	github.com/omec-project/openapi v1.4.1
 	github.com/omec-project/util v1.3.2
 	github.com/prometheus/client_golang v1.22.0
 	github.com/stretchr/testify v1.10.0
@@ -54,11 +54,11 @@ require (
 	github.com/ugorji/go/codec v1.2.14 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/arch v0.17.0 // indirect
-	golang.org/x/crypto v0.38.0 // indirect
-	golang.org/x/net v0.40.0 // indirect
+	golang.org/x/crypto v0.39.0 // indirect
+	golang.org/x/net v0.41.0 // indirect
 	golang.org/x/oauth2 v0.30.0 // indirect
 	golang.org/x/sys v0.33.0 // indirect
-	golang.org/x/text v0.25.0 // indirect
+	golang.org/x/text v0.26.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 // indirect
 	google.golang.org/grpc v1.72.2 // indirect
 	google.golang.org/protobuf v1.36.6 // indirect
diff --git a/go.sum b/go.sum
index e13c67c5..b59e6284 100644
--- a/go.sum
+++ b/go.sum
@@ -2,6 +2,8 @@ github.com/5GC-DEV/config5g-cdac v0.2.1 h1:7Cqwmqh5jqeWtwYTrITflrGotglIRBIb1P3EF
 github.com/5GC-DEV/config5g-cdac v0.2.1/go.mod h1:0OEL6UoNKKlx2tlNSoKpRtzckwxR2SL+pRBDAOCT4BU=
 github.com/5GC-DEV/event v0.0.0-20250920143456-3d7f9c51c82a h1:Zql0XFQw2yfBPc7Yn51cHQO1B1h/XU7Vs9ARqOy19NA=
 github.com/5GC-DEV/event v0.0.0-20250920143456-3d7f9c51c82a/go.mod h1:1c1txRb2QALAgLrRABwrydgjR/hHq/N7m4cwhhL+ggk=
+github.com/5GC-DEV/openapi-cdac v0.4.1 h1:EFGYKz6D+k2tI4fEvSDAJseVo3amgoZEK3tVrp5znec=
+github.com/5GC-DEV/openapi-cdac v0.4.1/go.mod h1:KLX5UeLe67E9SQC/vVNArCa4KK4luoDNAS0kRGkdE74=
 github.com/antihax/optional v1.0.0 h1:xK2lYat7ZLaVVcIuj82J8kIro4V6kDe0AUDFboUCwcg=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d h1:Byv0BzEl3/e6D5CLfI0j/7hiIEtvGVFPCZ7Ei2oq8iQ=
@@ -88,8 +90,6 @@ github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32 h1:W6apQkHrMkS0Muv8G/TipAy/FJl/rCYT0+EuS8+Z0z4=
 github.com/nbio/st v0.0.0-20140626010706-e9e8d9816f32/go.mod h1:9wM+0iRr9ahx58uYLpLIr5fm8diHn0JbqRycJi6w0Ms=
-github.com/omec-project/openapi v1.4.1 h1:F9RAjS5at/xcd2Iadl4/V0I3veYnH2WiFc3B7bj6Y8k=
-github.com/omec-project/openapi v1.4.1/go.mod h1:RVoo/FjKWlqg95hRRqBhQYzoCUZlE+h6/u4vj8bP2Jo=
 github.com/omec-project/util v1.3.2 h1:5JP4ZYqMPPESSYrgc6LQNlcvJ/Xhrq8u5jSV405iuX8=
 github.com/omec-project/util v1.3.2/go.mod h1:Q5hNzZ0VSIbYzi+FRaJrvVD12BxK0n5uoNvvV3qn+ro=
 github.com/pelletier/go-toml/v2 v2.2.4 h1:mye9XuhQ6gvn5h28+VilKrrPoQVanw5PMw/TB0t5Ec4=
@@ -145,17 +145,17 @@ go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/arch v0.17.0 h1:4O3dfLzd+lQewptAHqjewQZQDyEdejz3VwgeYwkZneU=
 golang.org/x/arch v0.17.0/go.mod h1:bdwinDaKcfZUGpH09BB7ZmOfhalA8lQdzl62l8gGWsk=
-golang.org/x/crypto v0.38.0 h1:jt+WWG8IZlBnVbomuhg2Mdq0+BBQaHbtqHEFEigjUV8=
-golang.org/x/crypto v0.38.0/go.mod h1:MvrbAqul58NNYPKnOra203SB9vpuZW0e+RRZV+Ggqjw=
-golang.org/x/net v0.40.0 h1:79Xs7wF06Gbdcg4kdCCIQArK11Z1hr5POQ6+fIYHNuY=
-golang.org/x/net v0.40.0/go.mod h1:y0hY0exeL2Pku80/zKK7tpntoX23cqL3Oa6njdgRtds=
+golang.org/x/crypto v0.39.0 h1:SHs+kF4LP+f+p14esP5jAoDpHU8Gu/v9lFRK6IT5imM=
+golang.org/x/crypto v0.39.0/go.mod h1:L+Xg3Wf6HoL4Bn4238Z6ft6KfEpN0tJGo53AAPC632U=
+golang.org/x/net v0.41.0 h1:vBTly1HeNPEn3wtREYfy4GZ/NECgw2Cnl+nK6Nz3uvw=
+golang.org/x/net v0.41.0/go.mod h1:B/K4NNqkfmg07DQYrbwvSluqCJOOXwUjeb/5lOisjbA=
 golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
 golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw=
 golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
-golang.org/x/text v0.25.0 h1:qVyWApTSYLk/drJRO5mDlNYskwQznZmkpV2c8q9zls4=
-golang.org/x/text v0.25.0/go.mod h1:WEdwpYrmk1qmdHvhkSTNPm3app7v4rsT8F2UD6+VHIA=
+golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
+golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822 h1:fc6jSaCT0vBduLYZHYrBBNY4dsWuvgyff9noRNDdBeE=
 google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822/go.mod h1:qQ0YXyHHx3XkvlzUtpXDkS29lDSafHMZBAZDc03LQ3A=
 google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
diff --git a/httpcallback/amf_status_change_notify.go b/httpcallback/amf_status_change_notify.go
index c1b8dcd8..553ed54e 100644
--- a/httpcallback/amf_status_change_notify.go
+++ b/httpcallback/amf_status_change_notify.go
@@ -9,9 +9,9 @@ package httpcallback
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/httpcallback/sm_policy_notify.go b/httpcallback/sm_policy_notify.go
index dff93b77..57b49e75 100644
--- a/httpcallback/sm_policy_notify.go
+++ b/httpcallback/sm_policy_notify.go
@@ -8,9 +8,9 @@ package httpcallback
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/internal/notifyevent/dispatcher.go b/internal/notifyevent/dispatcher.go
index a5fd2719..180a037c 100644
--- a/internal/notifyevent/dispatcher.go
+++ b/internal/notifyevent/dispatcher.go
@@ -7,7 +7,7 @@ package notifyevent
 
 import (
 	"github.com/5GC-DEV/event"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/logger"
 )
 
diff --git a/internal/notifyevent/send_smpolicy_termination.go b/internal/notifyevent/send_smpolicy_termination.go
index 52b6a612..fb202acd 100644
--- a/internal/notifyevent/send_smpolicy_termination.go
+++ b/internal/notifyevent/send_smpolicy_termination.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 
 	"github.com/5GC-DEV/event"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/util"
 )
diff --git a/internal/notifyevent/send_smpolicy_update.go b/internal/notifyevent/send_smpolicy_update.go
index 2bfa6cc0..b9d7642f 100644
--- a/internal/notifyevent/send_smpolicy_update.go
+++ b/internal/notifyevent/send_smpolicy_update.go
@@ -10,7 +10,7 @@ import (
 	"net/http"
 
 	"github.com/5GC-DEV/event"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/util"
 )
diff --git a/oam/api_get_am_policy.go b/oam/api_get_am_policy.go
index 228b178a..8184919a 100644
--- a/oam/api_get_am_policy.go
+++ b/oam/api_get_am_policy.go
@@ -8,9 +8,9 @@ package oam
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/pcftests/pcf_test.go b/pcftests/pcf_test.go
index 9ec96002..12388086 100644
--- a/pcftests/pcf_test.go
+++ b/pcftests/pcf_test.go
@@ -22,9 +22,9 @@ import (
 	"time"
 
 	protos "github.com/5GC-DEV/config5g-cdac/proto/sdcoreConfig"
+	"github.com/5GC-DEV/openapi-cdac/Nnrf_NFDiscovery"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/antihax/optional"
-	"github.com/omec-project/openapi/Nnrf_NFDiscovery"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/consumer"
 	pcfContext "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/factory"
diff --git a/policyauthorization/api_application_sessions_collection.go b/policyauthorization/api_application_sessions_collection.go
index b1bf8113..dc29d2cb 100644
--- a/policyauthorization/api_application_sessions_collection.go
+++ b/policyauthorization/api_application_sessions_collection.go
@@ -17,9 +17,9 @@ package policyauthorization
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/pcf/util"
diff --git a/policyauthorization/api_events_subscription_document.go b/policyauthorization/api_events_subscription_document.go
index e6562620..9aa23aa6 100644
--- a/policyauthorization/api_events_subscription_document.go
+++ b/policyauthorization/api_events_subscription_document.go
@@ -17,9 +17,9 @@ package policyauthorization
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/pcf/util"
diff --git a/policyauthorization/api_individual_application_session_context_document.go b/policyauthorization/api_individual_application_session_context_document.go
index 57061a05..6107fc88 100644
--- a/policyauthorization/api_individual_application_session_context_document.go
+++ b/policyauthorization/api_individual_application_session_context_document.go
@@ -17,9 +17,9 @@ package policyauthorization
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/producer/ampolicy.go b/producer/ampolicy.go
index 6ea576fa..1590c392 100644
--- a/producer/ampolicy.go
+++ b/producer/ampolicy.go
@@ -11,9 +11,9 @@ import (
 	"net/http"
 	"reflect"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/mohae/deepcopy"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/consumer"
 	pcf_context "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
diff --git a/producer/bdtpolicy.go b/producer/bdtpolicy.go
index c47dfa08..4d0e324f 100644
--- a/producer/bdtpolicy.go
+++ b/producer/bdtpolicy.go
@@ -10,12 +10,12 @@ import (
 	"fmt"
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac/Nnrf_NFDiscovery"
+	"github.com/5GC-DEV/openapi-cdac/Nudr_DataRepository"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/antihax/optional"
 	"github.com/google/uuid"
 	"github.com/mohae/deepcopy"
-	"github.com/omec-project/openapi/Nnrf_NFDiscovery"
-	"github.com/omec-project/openapi/Nudr_DataRepository"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/consumer"
 	pcf_context "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
diff --git a/producer/callback.go b/producer/callback.go
index 12878f1e..f2f71730 100644
--- a/producer/callback.go
+++ b/producer/callback.go
@@ -9,8 +9,8 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/omec-project/openapi/models"
-	nrfCache "github.com/omec-project/openapi/nrfcache"
+	"github.com/5GC-DEV/openapi-cdac/models"
+	nrfCache "github.com/5GC-DEV/openapi-cdac/nrfcache"
 	"github.com/omec-project/pcf/consumer"
 	pcfContext "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
diff --git a/producer/oam.go b/producer/oam.go
index 90aa8894..96a463b4 100644
--- a/producer/oam.go
+++ b/producer/oam.go
@@ -9,7 +9,7 @@ import (
 	"net/http"
 	"strconv"
 
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/producer/policyauthorization.go b/producer/policyauthorization.go
index 15f1ed4a..dd53bd41 100644
--- a/producer/policyauthorization.go
+++ b/producer/policyauthorization.go
@@ -15,9 +15,9 @@ import (
 	"strings"
 	"time"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/cydev/zero"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	pcf_context "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/internal/notifyevent"
 	"github.com/omec-project/pcf/logger"
diff --git a/producer/smpolicy.go b/producer/smpolicy.go
index b8fcebe5..1d4bc119 100644
--- a/producer/smpolicy.go
+++ b/producer/smpolicy.go
@@ -13,11 +13,11 @@ import (
 	"strconv"
 	"strings"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/Nudr_DataRepository"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/antihax/optional"
 	"github.com/mohae/deepcopy"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/Nudr_DataRepository"
-	"github.com/omec-project/openapi/models"
 	pcf_context "github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 	stats "github.com/omec-project/pcf/metrics"
diff --git a/service/init.go b/service/init.go
index 76ce2824..133274d5 100644
--- a/service/init.go
+++ b/service/init.go
@@ -23,12 +23,12 @@ import (
 
 	grpcClient "github.com/5GC-DEV/config5g-cdac/proto/client"
 	protos "github.com/5GC-DEV/config5g-cdac/proto/sdcoreConfig"
+	"github.com/5GC-DEV/openapi-cdac/Nnrf_NFDiscovery"
+	openapiLogger "github.com/5GC-DEV/openapi-cdac/logger"
+	"github.com/5GC-DEV/openapi-cdac/models"
+	nrfCache "github.com/5GC-DEV/openapi-cdac/nrfcache"
 	"github.com/antihax/optional"
 	"github.com/gin-contrib/cors"
-	"github.com/omec-project/openapi/Nnrf_NFDiscovery"
-	openapiLogger "github.com/omec-project/openapi/logger"
-	"github.com/omec-project/openapi/models"
-	nrfCache "github.com/omec-project/openapi/nrfcache"
 	"github.com/omec-project/pcf/ampolicy"
 	"github.com/omec-project/pcf/bdtpolicy"
 	"github.com/omec-project/pcf/callback"
diff --git a/smpolicy/api_default.go b/smpolicy/api_default.go
index 22ea0d26..0b99d234 100644
--- a/smpolicy/api_default.go
+++ b/smpolicy/api_default.go
@@ -17,9 +17,9 @@ package smpolicy
 import (
 	"net/http"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/gin-gonic/gin"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/logger"
 	"github.com/omec-project/pcf/producer"
 	"github.com/omec-project/util/httpwrapper"
diff --git a/util/convert.go b/util/convert.go
index 19d2c788..9049cc6b 100644
--- a/util/convert.go
+++ b/util/convert.go
@@ -8,7 +8,7 @@ package util
 import (
 	"fmt"
 
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 )
 
 var policyTriggerArray = []models.PolicyControlRequestTrigger{
diff --git a/util/init_context.go b/util/init_context.go
index f0645f66..8353e5f4 100644
--- a/util/init_context.go
+++ b/util/init_context.go
@@ -10,9 +10,9 @@ import (
 	"os"
 	"time"
 
+	"github.com/5GC-DEV/openapi-cdac"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/google/uuid"
-	"github.com/omec-project/openapi"
-	"github.com/omec-project/openapi/models"
 	"github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/factory"
 	"github.com/omec-project/pcf/logger"
diff --git a/util/pcc_rule.go b/util/pcc_rule.go
index 09b48343..270368fa 100644
--- a/util/pcc_rule.go
+++ b/util/pcc_rule.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/logger"
 )
 
diff --git a/util/pcf_util.go b/util/pcf_util.go
index 0103df6d..97c60a8b 100644
--- a/util/pcf_util.go
+++ b/util/pcf_util.go
@@ -13,12 +13,12 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/omec-project/openapi/Namf_Communication"
-	"github.com/omec-project/openapi/Npcf_AMPolicy"
-	"github.com/omec-project/openapi/Npcf_PolicyAuthorization"
-	"github.com/omec-project/openapi/Npcf_SMPolicyControl"
-	"github.com/omec-project/openapi/Nudr_DataRepository"
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/Namf_Communication"
+	"github.com/5GC-DEV/openapi-cdac/Npcf_AMPolicy"
+	"github.com/5GC-DEV/openapi-cdac/Npcf_PolicyAuthorization"
+	"github.com/5GC-DEV/openapi-cdac/Npcf_SMPolicyControl"
+	"github.com/5GC-DEV/openapi-cdac/Nudr_DataRepository"
+	"github.com/5GC-DEV/openapi-cdac/models"
 	"github.com/omec-project/pcf/context"
 	"github.com/omec-project/pcf/logger"
 )
diff --git a/util/search_nf_service.go b/util/search_nf_service.go
index 91234f84..3c262177 100644
--- a/util/search_nf_service.go
+++ b/util/search_nf_service.go
@@ -8,7 +8,7 @@ package util
 import (
 	"fmt"
 
-	"github.com/omec-project/openapi/models"
+	"github.com/5GC-DEV/openapi-cdac/models"
 )
 
 // SearchNFServiceUri returns NF Uri derived from NfProfile with corresponding service