diff --git a/cmd/oapi-codegen/oapi-codegen.go b/cmd/oapi-codegen/oapi-codegen.go
index 749612507b..58917563f5 100644
--- a/cmd/oapi-codegen/oapi-codegen.go
+++ b/cmd/oapi-codegen/oapi-codegen.go
@@ -25,8 +25,8 @@ import (
 
 	"gopkg.in/yaml.v2"
 
-	"github.com/deepmap/oapi-codegen/pkg/codegen"
-	"github.com/deepmap/oapi-codegen/pkg/util"
+	"github.com/UNO-SOFT/oapi-codegen/pkg/codegen"
+	"github.com/UNO-SOFT/oapi-codegen/pkg/util"
 )
 
 func errExit(format string, args ...interface{}) {
@@ -45,7 +45,7 @@ var (
 	flagExcludeSchemas string
 	flagConfigFile     string
 	flagAliasTypes     bool
-	flagPrintVersion bool
+	flagPrintVersion   bool
 )
 
 type configuration struct {
diff --git a/examples/petstore-expanded/chi/api/petstore.gen.go b/examples/petstore-expanded/chi/api/petstore.gen.go
index a4b537ec95..da3806b3f2 100644
--- a/examples/petstore-expanded/chi/api/petstore.gen.go
+++ b/examples/petstore-expanded/chi/api/petstore.gen.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/go-chi/chi/v5"
 )
 
diff --git a/examples/petstore-expanded/echo/api/petstore-server.gen.go b/examples/petstore-expanded/echo/api/petstore-server.gen.go
index 08752263ef..a9df11c8cd 100644
--- a/examples/petstore-expanded/echo/api/petstore-server.gen.go
+++ b/examples/petstore-expanded/echo/api/petstore-server.gen.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/go.mod b/go.mod
index 45370106a6..d321710620 100644
--- a/go.mod
+++ b/go.mod
@@ -1,8 +1,8 @@
-module github.com/deepmap/oapi-codegen
+module github.com/UNO-SOFT/oapi-codegen
 
 require (
 	github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c
-	github.com/getkin/kin-openapi v0.61.0
+	github.com/UNO-SOFT/kin-openapi v0.64.0-alpha2
 	github.com/go-chi/chi/v5 v5.0.0
 	github.com/golangci/lint-1 v0.0.0-20181222135242-d2cdd8c08219
 	github.com/labstack/echo/v4 v4.2.1
diff --git a/go.sum b/go.sum
index 4cdb220949..72487cf8d1 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,7 @@
+github.com/UNO-SOFT/kin-openapi v0.64.0-alpha1 h1:XnPPzDMCEU0w96/8clXgD1BU6U+eYmZJCoKMx124Reo=
+github.com/UNO-SOFT/kin-openapi v0.64.0-alpha1/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
+github.com/UNO-SOFT/kin-openapi v0.64.0-alpha2 h1:BgMGlGBSA71jdM7PXnyLRJk48tFpkdUAVMMZJ9CfU9o=
+github.com/UNO-SOFT/kin-openapi v0.64.0-alpha2/go.mod h1:MMkZAT/wFZydnd2y7mrQmQZndbRF+837/ewPl/6efxA=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c h1:/ovYnF02fwL0kvspmy9AuyKg1JhdTRUgPw4nUxd9oZM=
 github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -5,8 +9,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
-github.com/getkin/kin-openapi v0.61.0 h1:6awGqF5nG5zkVpMsAih1QH4VgzS8phTxECUWIFo7zko=
-github.com/getkin/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
+github.com/UNO-SOFT/kin-openapi v0.61.0 h1:6awGqF5nG5zkVpMsAih1QH4VgzS8phTxECUWIFo7zko=
+github.com/UNO-SOFT/kin-openapi v0.61.0/go.mod h1:7Yn5whZr5kJi6t+kShccXS8ae1APpYTW6yheSwk8Yi4=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/go-chi/chi/v5 v5.0.0 h1:DBPx88FjZJH3FsICfDAfIfnb7XxKIYVGG6lOPlhENAg=
diff --git a/internal/test/client/client.gen.go b/internal/test/client/client.gen.go
index 8cb1f2bea1..9b09637d38 100644
--- a/internal/test/client/client.gen.go
+++ b/internal/test/client/client.gen.go
@@ -17,7 +17,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/internal/test/components/components.gen.go b/internal/test/components/components.gen.go
index 3aa31bb73b..49e3eb57a7 100644
--- a/internal/test/components/components.gen.go
+++ b/internal/test/components/components.gen.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 )
diff --git a/internal/test/externalref/externalref.gen.go b/internal/test/externalref/externalref.gen.go
index 698bc3fa69..78fd98e551 100644
--- a/internal/test/externalref/externalref.gen.go
+++ b/internal/test/externalref/externalref.gen.go
@@ -14,7 +14,7 @@ import (
 
 	externalRef0 "github.com/deepmap/oapi-codegen/internal/test/externalref/packageA"
 	externalRef1 "github.com/deepmap/oapi-codegen/internal/test/externalref/packageB"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 // Container defines model for Container.
diff --git a/internal/test/externalref/packageA/externalref.gen.go b/internal/test/externalref/packageA/externalref.gen.go
index 3b58e3c2d1..927432f499 100644
--- a/internal/test/externalref/packageA/externalref.gen.go
+++ b/internal/test/externalref/packageA/externalref.gen.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 
 	externalRef0 "github.com/deepmap/oapi-codegen/internal/test/externalref/packageB"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 // ObjectA defines model for ObjectA.
diff --git a/internal/test/externalref/packageB/externalref.gen.go b/internal/test/externalref/packageB/externalref.gen.go
index aa545f1e56..485424af65 100644
--- a/internal/test/externalref/packageB/externalref.gen.go
+++ b/internal/test/externalref/packageB/externalref.gen.go
@@ -12,7 +12,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 // ObjectB defines model for ObjectB.
diff --git a/internal/test/issues/issue-312/issue.gen.go b/internal/test/issues/issue-312/issue.gen.go
index e8c0604749..109c42b8e0 100644
--- a/internal/test/issues/issue-312/issue.gen.go
+++ b/internal/test/issues/issue-312/issue.gen.go
@@ -18,7 +18,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/internal/test/issues/issue-52/issue.gen.go b/internal/test/issues/issue-52/issue.gen.go
index 1a400279a3..c35824a2d1 100644
--- a/internal/test/issues/issue-52/issue.gen.go
+++ b/internal/test/issues/issue-52/issue.gen.go
@@ -16,7 +16,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
 )
diff --git a/internal/test/issues/issue-52/issue_test.go b/internal/test/issues/issue-52/issue_test.go
index e549443e09..ca11fca064 100644
--- a/internal/test/issues/issue-52/issue_test.go
+++ b/internal/test/issues/issue-52/issue_test.go
@@ -3,7 +3,7 @@ package issue_52
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 
 	"github.com/deepmap/oapi-codegen/pkg/codegen"
diff --git a/internal/test/issues/issue-grab_import_names/issue.gen.go b/internal/test/issues/issue-grab_import_names/issue.gen.go
index dca6350951..a977aba6ef 100644
--- a/internal/test/issues/issue-grab_import_names/issue.gen.go
+++ b/internal/test/issues/issue-grab_import_names/issue.gen.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/internal/test/issues/issue-grab_import_names/issue_test.go b/internal/test/issues/issue-grab_import_names/issue_test.go
index 705ae8227a..b92ca96038 100644
--- a/internal/test/issues/issue-grab_import_names/issue_test.go
+++ b/internal/test/issues/issue-grab_import_names/issue_test.go
@@ -4,7 +4,7 @@ import (
 	"testing"
 
 	"github.com/deepmap/oapi-codegen/pkg/codegen"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/issues/issue-illegal_enum_names/issue.gen.go b/internal/test/issues/issue-illegal_enum_names/issue.gen.go
index 768ff6388d..09d4e07248 100644
--- a/internal/test/issues/issue-illegal_enum_names/issue.gen.go
+++ b/internal/test/issues/issue-illegal_enum_names/issue.gen.go
@@ -16,7 +16,7 @@ import (
 	"path"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/internal/test/issues/issue-illegal_enum_names/issue_test.go b/internal/test/issues/issue-illegal_enum_names/issue_test.go
index f869f0e02e..5709a28c72 100644
--- a/internal/test/issues/issue-illegal_enum_names/issue_test.go
+++ b/internal/test/issues/issue-illegal_enum_names/issue_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 
 	"github.com/deepmap/oapi-codegen/pkg/codegen"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/require"
 )
 
diff --git a/internal/test/parameters/parameters.gen.go b/internal/test/parameters/parameters.gen.go
index 896539c5a5..d626e2726e 100644
--- a/internal/test/parameters/parameters.gen.go
+++ b/internal/test/parameters/parameters.gen.go
@@ -17,7 +17,7 @@ import (
 	"strings"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/internal/test/schemas/schemas.gen.go b/internal/test/schemas/schemas.gen.go
index df91186f8d..3537e5a3b3 100644
--- a/internal/test/schemas/schemas.gen.go
+++ b/internal/test/schemas/schemas.gen.go
@@ -21,7 +21,7 @@ import (
 	"gopkg.in/yaml.v2"
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/labstack/echo/v4"
 )
 
diff --git a/pkg/chi-middleware/oapi_validate.go b/pkg/chi-middleware/oapi_validate.go
index d7db5c14b6..a29ae75b03 100644
--- a/pkg/chi-middleware/oapi_validate.go
+++ b/pkg/chi-middleware/oapi_validate.go
@@ -9,10 +9,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/getkin/kin-openapi/openapi3filter"
-	"github.com/getkin/kin-openapi/routers"
-	"github.com/getkin/kin-openapi/routers/legacy"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3filter"
+	"github.com/UNO-SOFT/kin-openapi/routers"
+	"github.com/UNO-SOFT/kin-openapi/routers/legacy"
 )
 
 // Options to customize request validation, openapi3filter specified options will be passed through.
diff --git a/pkg/chi-middleware/oapi_validate_test.go b/pkg/chi-middleware/oapi_validate_test.go
index 6e2c10f72e..25c3d76151 100644
--- a/pkg/chi-middleware/oapi_validate_test.go
+++ b/pkg/chi-middleware/oapi_validate_test.go
@@ -8,8 +8,8 @@ import (
 	"testing"
 
 	"github.com/deepmap/oapi-codegen/pkg/testutil"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3filter"
 	"github.com/go-chi/chi/v5"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
diff --git a/pkg/codegen/codegen.go b/pkg/codegen/codegen.go
index b1e318b15e..b17965dfb2 100644
--- a/pkg/codegen/codegen.go
+++ b/pkg/codegen/codegen.go
@@ -23,11 +23,11 @@ import (
 	"strings"
 	"text/template"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/pkg/errors"
 	"golang.org/x/tools/imports"
 
-	"github.com/deepmap/oapi-codegen/pkg/codegen/templates"
+	"github.com/UNO-SOFT/oapi-codegen/pkg/codegen/templates"
 )
 
 // Options defines the optional code to generate.
diff --git a/pkg/codegen/codegen_test.go b/pkg/codegen/codegen_test.go
index fb7900eadd..bed2ee8869 100644
--- a/pkg/codegen/codegen_test.go
+++ b/pkg/codegen/codegen_test.go
@@ -9,7 +9,7 @@ import (
 
 	examplePetstoreClient "github.com/deepmap/oapi-codegen/examples/petstore-expanded"
 	examplePetstore "github.com/deepmap/oapi-codegen/examples/petstore-expanded/echo/api"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/golangci/lint-1"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/pkg/codegen/filter.go b/pkg/codegen/filter.go
index bf65b59f31..986b1e35d1 100644
--- a/pkg/codegen/filter.go
+++ b/pkg/codegen/filter.go
@@ -1,6 +1,6 @@
 package codegen
 
-import "github.com/getkin/kin-openapi/openapi3"
+import "github.com/UNO-SOFT/kin-openapi/openapi3"
 
 func filterOperationsByTag(swagger *openapi3.T, opts Options) {
 	if len(opts.ExcludeTags) > 0 {
diff --git a/pkg/codegen/filter_test.go b/pkg/codegen/filter_test.go
index 1342493491..88a9f10188 100644
--- a/pkg/codegen/filter_test.go
+++ b/pkg/codegen/filter_test.go
@@ -3,7 +3,7 @@ package codegen
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/codegen/inline.go b/pkg/codegen/inline.go
index a7ad03462e..e083bd2a22 100644
--- a/pkg/codegen/inline.go
+++ b/pkg/codegen/inline.go
@@ -21,7 +21,7 @@ import (
 	"fmt"
 	"text/template"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 // This generates a gzipped, base64 encoded JSON representation of the
diff --git a/pkg/codegen/operations.go b/pkg/codegen/operations.go
index 45f92c034a..bc10745042 100644
--- a/pkg/codegen/operations.go
+++ b/pkg/codegen/operations.go
@@ -21,7 +21,7 @@ import (
 	"text/template"
 	"unicode"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/pkg/errors"
 )
 
diff --git a/pkg/codegen/prune.go b/pkg/codegen/prune.go
index 73f4fb9d55..a242243f7a 100644
--- a/pkg/codegen/prune.go
+++ b/pkg/codegen/prune.go
@@ -3,7 +3,7 @@ package codegen
 import (
 	"fmt"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 func stringInSlice(a string, list []string) bool {
diff --git a/pkg/codegen/prune_test.go b/pkg/codegen/prune_test.go
index 86437c2a07..2b9e70316f 100644
--- a/pkg/codegen/prune_test.go
+++ b/pkg/codegen/prune_test.go
@@ -3,7 +3,7 @@ package codegen
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/codegen/schema.go b/pkg/codegen/schema.go
index daa3ab9fd5..e57471682a 100644
--- a/pkg/codegen/schema.go
+++ b/pkg/codegen/schema.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/pkg/errors"
 )
 
@@ -165,7 +165,7 @@ func GenerateGoSchema(sref *openapi3.SchemaRef, path []string) (Schema, error) {
 
 	outSchema := Schema{
 		Description: StringToGoComment(schema.Description),
-		OAPISchema: schema,
+		OAPISchema:  schema,
 	}
 
 	// We can't support this in any meaningful way
@@ -343,30 +343,31 @@ func resolveType(schema *openapi3.Schema, path []string, outSchema *Schema) erro
 		outSchema.Properties = arrayType.Properties
 	case "integer":
 		// We default to int if format doesn't ask for something else.
-		if f == "int64" {
+		switch f {
+		case "int64":
 			outSchema.GoType = "int64"
-		} else if f == "int32" {
+		case "int32":
 			outSchema.GoType = "int32"
-		} else if f == "int16" {
+		case "int16":
 			outSchema.GoType = "int16"
-		} else if f == "int8" {
+		case "int8":
 			outSchema.GoType = "int8"
-		} else if f == "int" {
+		case "int":
 			outSchema.GoType = "int"
-		} else if f == "uint64" {
+		case "uint64":
 			outSchema.GoType = "uint64"
-		} else if f == "uint32" {
+		case "uint32":
 			outSchema.GoType = "uint32"
-		} else if f == "uint16" {
+		case "uint16":
 			outSchema.GoType = "uint16"
-		} else if f == "uint8" {
+		case "uint8":
 			outSchema.GoType = "uint8"
-		} else if f == "uint" {
+		case "uint":
 			outSchema.GoType = "uint"
-		} else if f == "" {
+		case "":
 			outSchema.GoType = "int"
-		} else {
-			return fmt.Errorf("invalid integer format: %s", f)
+		default:
+			return fmt.Errorf("invalid integer format: %q", f)
 		}
 	case "number":
 		// We default to float for "number"
diff --git a/pkg/codegen/templates/imports.tmpl b/pkg/codegen/templates/imports.tmpl
index 7f761f9c6f..e36373b9c6 100644
--- a/pkg/codegen/templates/imports.tmpl
+++ b/pkg/codegen/templates/imports.tmpl
@@ -22,7 +22,7 @@ import (
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
 	openapi_types "github.com/deepmap/oapi-codegen/pkg/types"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/go-chi/chi/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
diff --git a/pkg/codegen/templates/templates.gen.go b/pkg/codegen/templates/templates.gen.go
index f84945a9ea..8adb3bf646 100644
--- a/pkg/codegen/templates/templates.gen.go
+++ b/pkg/codegen/templates/templates.gen.go
@@ -750,7 +750,7 @@ import (
 
 	"github.com/deepmap/oapi-codegen/pkg/runtime"
 	openapi_types "github.com/deepmap/oapi-codegen/pkg/types"
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/go-chi/chi/v5"
 	"github.com/labstack/echo/v4"
 	"github.com/pkg/errors"
diff --git a/pkg/codegen/utils.go b/pkg/codegen/utils.go
index 6308875691..5f3df99adb 100644
--- a/pkg/codegen/utils.go
+++ b/pkg/codegen/utils.go
@@ -22,7 +22,7 @@ import (
 	"strings"
 	"unicode"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 var pathParamRE *regexp.Regexp
diff --git a/pkg/codegen/utils_test.go b/pkg/codegen/utils_test.go
index 4857ee4387..2d68d58673 100644
--- a/pkg/codegen/utils_test.go
+++ b/pkg/codegen/utils_test.go
@@ -16,7 +16,7 @@ package codegen
 import (
 	"testing"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/pkg/middleware/oapi_validate.go b/pkg/middleware/oapi_validate.go
index cbed69a91d..cc62406c61 100644
--- a/pkg/middleware/oapi_validate.go
+++ b/pkg/middleware/oapi_validate.go
@@ -21,10 +21,10 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/getkin/kin-openapi/openapi3filter"
-	"github.com/getkin/kin-openapi/routers"
-	"github.com/getkin/kin-openapi/routers/legacy"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3filter"
+	"github.com/UNO-SOFT/kin-openapi/routers"
+	"github.com/UNO-SOFT/kin-openapi/routers/legacy"
 	"github.com/labstack/echo/v4"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
 )
diff --git a/pkg/middleware/oapi_validate_test.go b/pkg/middleware/oapi_validate_test.go
index f63793d8f3..f3c20f9fa0 100644
--- a/pkg/middleware/oapi_validate_test.go
+++ b/pkg/middleware/oapi_validate_test.go
@@ -22,8 +22,8 @@ import (
 	"testing"
 
 	"github.com/deepmap/oapi-codegen/pkg/testutil"
-	"github.com/getkin/kin-openapi/openapi3"
-	"github.com/getkin/kin-openapi/openapi3filter"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3filter"
 	"github.com/labstack/echo/v4"
 	echomiddleware "github.com/labstack/echo/v4/middleware"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/util/loader.go b/pkg/util/loader.go
index 9efbb8f38e..8189a838e5 100644
--- a/pkg/util/loader.go
+++ b/pkg/util/loader.go
@@ -3,7 +3,7 @@ package util
 import (
 	"net/url"
 
-	"github.com/getkin/kin-openapi/openapi3"
+	"github.com/UNO-SOFT/kin-openapi/openapi3"
 )
 
 func LoadSwagger(filePath string) (swagger *openapi3.T, err error) {