diff --git a/README.md b/README.md
index 3a443c0258d..dbe64fc7c44 100644
--- a/README.md
+++ b/README.md
@@ -263,7 +263,7 @@ java -jar target/openapi-json-schema-generator-cli.jar generate \
 
 To get a list of **general** options available, please run `java -jar target/openapi-json-schema-generator-cli.jar help generate`
 
-To get a list of PHP specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar target/openapi-json-schema-generator-cli.jar config-help -g php`
+To get a list of python specified options (which can be passed to the generator with a config file via the `-c` option), please run `java -jar target/openapi-json-schema-generator-cli.jar config-help -g python`
 
 ## Usage
 
@@ -305,37 +305,164 @@ SYNOPSIS
                 [(-e <templating engine> | --engine <templating engine>)]
                 [--enable-post-process-file]
                 [(-g <generator name> | --generator-name <generator name>)]
-                [--generate-alias-as-model] [--git-host <git host>]
-                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
-                [--global-property <global properties>...] [--group-id <group id>]
+                [--git-host <git host>] [--git-repo-id <git repo id>]
+                [--git-user-id <git user id>] [--global-property <global properties>...]
+                [--group-id <group id>] [--hide-generation-timestamp]
                 [--http-user-agent <http user agent>]
                 [(-i <spec file> | --input-spec <spec file>)]
                 [--ignore-file-override <ignore file override location>]
-                [--invoker-package <invoker package>]
-                [--log-to-stderr] [--minimal-update]
+                [--ints-allowed-for-float-double-formats]
+                [--invoker-package <invoker package>] [--minimal-update]
                 [--model-name-prefix <model name prefix>]
                 [--model-name-suffix <model name suffix>]
                 [(-o <output directory> | --output <output directory>)] [(-p <additional properties> | --additional-properties <additional properties>)...]
                 [--package-name <package name>] [--release-note <release note>]
-                [--remove-operation-id-prefix]
-                [(-s | --skip-overwrite)]
+                [--remove-enum-value-prefix] [--remove-operation-id-prefix]
+                [(-s | --skip-overwrite)] [--skip-operation-example]
                 [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
                 [(-t <template directory> | --template-dir <template directory>)]
                 [(-v | --verbose)]
+```
+<details>
+<summary>generate OPTIONS</summary>
 
+```text
 OPTIONS
         -a <authorization>, --auth <authorization>
             adds authorization headers when fetching the OpenAPI definitions
             remotely. Pass in a URL-encoded string of name:header with a comma
             separating multiple values
 
-...... (results omitted)
+        --api-name-suffix <api name suffix>
+            Suffix that will be appended to all API names ('tags'). Default:
+            Api. e.g. Pet => PetApi. Note: Only ruby, python, jaxrs generators
+            support this feature at the moment.
+
+        --api-package <api package>
+            package for generated api classes
+
+        --artifact-id <artifact id>
+            artifactId in generated pom.xml. This also becomes part of the
+            generated library's filename
+
+        --artifact-version <artifact version>
+            artifact version in generated pom.xml. This also becomes part of the
+            generated library's filename
+
+        -c <configuration file>, --config <configuration file>
+            Path to configuration file. It can be JSON or YAML. If file is JSON,
+            the content should have the format {"optionKey":"optionValue",
+            "optionKey1":"optionValue1"...}. If file is YAML, the content should
+            have the format optionKey: optionValue. Supported options can be
+            different for each language. Run config-help -g {generator name}
+            command for language-specific config options.
+
+        --dry-run
+            Try things out and report on potential changes (without actually
+            making changes).
+
+        -e <templating engine>, --engine <templating engine>
+            templating engine: "handlebars"(default) or "mustache"
+
+        --enable-post-process-file
+            Enable post-processing file using environment variables.
+
+        -g <generator name>, --generator-name <generator name>
+            generator to use (see list command for list)
+
+        --git-host <git host>
+            Git host, e.g. gitlab.com.
+
+        --git-repo-id <git repo id>
+            Git repo ID, e.g. openapi-generator.
+
+        --git-user-id <git user id>
+            Git user ID, e.g. openapijsonschematools.
+
+        --global-property <global properties>
+            sets specified global properties (previously called 'system
+            properties') in the format of name=value,name=value (or multiple
+            options, each with name=value)
+
+        --group-id <group id>
+            groupId in generated pom.xml
+
+        --hide-generation-timestamp
+            Hides the generation timestamp when files are generated.
+
+        --http-user-agent <http user agent>
+            HTTP user agent, e.g. codegen_csharp_api_client, default to
+            'OpenAPI-Generator/{packageVersion}/{language}'
+
+        -i <spec file>, --input-spec <spec file>
+            location of the OpenAPI spec, as URL or file (required if not loaded
+            via config using -c)
+
+        --ignore-file-override <ignore file override location>
+            Specifies an override location for the .openapi-generator-ignore
+            file. Most useful on initial generation.
+
+        --ints-allowed-for-float-double-formats
+            Integers are allowed in for type: number format:float/double
+            payloads
+
+        --invoker-package <invoker package>
+            root package for generated code
+
+        --minimal-update
+            Only write output files that have changed.
+
+        --model-name-prefix <model name prefix>
+            Prefix that will be prepended to all model names.
+
+        --model-name-suffix <model name suffix>
+            Suffix that will be appended to all model names.
+
+        -o <output directory>, --output <output directory>
+            where to write the generated files (current dir by default)
+
+        -p <additional properties>, --additional-properties <additional
+        properties>
+            sets additional properties that can be referenced by the mustache
+            templates in the format of name=value,name=value. You can also have
+            multiple occurrences of this option.
+
+        --package-name <package name>
+            package for generated classes (where supported)
+
+        --release-note <release note>
+            Release note, default to 'Minor update'.
+
+        --remove-enum-value-prefix
+            Remove the common prefix of enum values
+
+        --remove-operation-id-prefix
+            Remove prefix of operationId, e.g. config_getId => getId
+
+        -s, --skip-overwrite
+            specifies if the existing files should be overwritten during the
+            generation.
+
+        --skip-operation-example
+            Skip examples defined in operations to avoid out of memory errors.
+
+        --skip-validate-spec
+            Skips the default behavior of validating an input specification.
+
+        --strict-spec <true/false strict behavior>
+            'MUST' and 'SHALL' wording in OpenAPI spec is strictly adhered to.
+            e.g. when false, no fixes will be applied to documents which pass
+            validation but don't follow the spec.
+
+        -t <template directory>, --template-dir <template directory>
+            folder containing the template files
 
         -v, --verbose
             verbose mode
-
 ```
 
+</details>
+
 You can then use the auto-generated client. The README.md is a good starting point.
 
 Other generators have [samples](samples) too.
diff --git a/bin/generate_samples_configs/java_3_0_3_unit_test.yaml b/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
index fcf39643017..fca9793e0fa 100644
--- a/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
+++ b/bin/generate_samples_configs/java_3_0_3_unit_test.yaml
@@ -1,6 +1,7 @@
 generatorName: java
 outputDir: samples/client/3_0_3_unit_test/java
 inputSpec: src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec_nopaths.yaml
+intsAllowedForFloatDoubleFormats: true
 additionalProperties:
   artifactId: unit-test-api
   hideGenerationTimestamp: "true"
\ No newline at end of file
diff --git a/bin/generate_samples_configs/java_3_1_0_unit_test.yaml b/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
index e171ce79a27..51e00abc600 100644
--- a/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
+++ b/bin/generate_samples_configs/java_3_1_0_unit_test.yaml
@@ -1,5 +1,6 @@
 generatorName: java
 outputDir: samples/client/3_1_0_unit_test/java
 inputSpec: src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec_nopaths.yaml
+intsAllowedForFloatDoubleFormats: true
 additionalProperties:
   artifactId: unit-test-api
diff --git a/bin/generate_samples_configs/python_3_0_3_unit_test.yaml b/bin/generate_samples_configs/python_3_0_3_unit_test.yaml
index 8a837c95d42..e5fac1ad6fb 100644
--- a/bin/generate_samples_configs/python_3_0_3_unit_test.yaml
+++ b/bin/generate_samples_configs/python_3_0_3_unit_test.yaml
@@ -1,5 +1,6 @@
 generatorName: python
 outputDir: samples/client/3_0_3_unit_test/python
 inputSpec: src/test/resources/3_0/unit_test_spec/3_0_3_unit_test_spec.yaml
+intsAllowedForFloatDoubleFormats: true
 additionalProperties:
   packageName: unit_test_api
diff --git a/bin/generate_samples_configs/python_3_1_0_unit_test.yaml b/bin/generate_samples_configs/python_3_1_0_unit_test.yaml
index 90768fad913..9d64f5f3bbc 100644
--- a/bin/generate_samples_configs/python_3_1_0_unit_test.yaml
+++ b/bin/generate_samples_configs/python_3_1_0_unit_test.yaml
@@ -1,5 +1,6 @@
 generatorName: python
 outputDir: samples/client/3_1_0_unit_test/python
 inputSpec: src/test/resources/3_1/unit_test_spec/3_1_0_unit_test_spec.yaml
+intsAllowedForFloatDoubleFormats: true
 additionalProperties:
   packageName: unit_test_api
diff --git a/docs/usage.md b/docs/usage.md
index d6ac60c3fac..ed63085d4e5 100644
--- a/docs/usage.md
+++ b/docs/usage.md
@@ -11,10 +11,10 @@ This page demonstrates navigating the options via CLI. Commands are presented he
 The `help` option lists all commands available to the CLI.
 
 ```text
-openapi-generator-cli help
-usage: openapi-generator-cli <command> [<args>]
+openapi-json-schema-generator-cli help
+usage: openapi-json-schema-generator-cli <command> [<args>]
 
-The most commonly used openapi-generator-cli commands are:
+The most commonly used openapi-json-schema-generator-cli commands are:
     author        Utilities for authoring generators or customizing templates.
     batch         Generate code in batch via external configs.
     config-help   Config help for chosen lang
@@ -25,7 +25,7 @@ The most commonly used openapi-generator-cli commands are:
     validate      Validate specification
     version       Show version information used in tooling
 
-See 'openapi-generator-cli help <command>' for more information on a specific
+See 'openapi-json-schema-generator-cli help <command>' for more information on a specific
 command.
 ```
 
@@ -35,10 +35,10 @@ The version command provides version information, returning either the version b
 
 ```text
 NAME
-        openapi-generator-cli version - Show version information used in tooling
+        openapi-json-schema-generator-cli version - Show version information used in tooling
 
 SYNOPSIS
-        openapi-generator-cli version [--full] [--sha]
+        openapi-json-schema-generator-cli version [--full] [--sha]
 
 OPTIONS
         --full
@@ -53,12 +53,12 @@ OPTIONS
 The `list` command outputs a formatted list of every available generator. Pass the `-s/--short` option if you would like a CSV output for easy parsing.
 
 ```text
-openapi-generator-cli help list
+openapi-json-schema-generator-cli help list
 NAME
-        openapi-generator-cli list - Lists the available generators
+        openapi-json-schema-generator-cli list - Lists the available generators
 
 SYNOPSIS
-        openapi-generator-cli list [(-i <include> | --include <include>)]
+        openapi-json-schema-generator-cli list [(-i <include> | --include <include>)]
                 [(-s | --short)]
 
 OPTIONS
@@ -74,7 +74,7 @@ OPTIONS
 Example:
 
 ```bash
-openapi-generator-cli list -s | tr ',' '\n'
+openapi-json-schema-generator-cli list -s | tr ',' '\n'
 ```
 
 For the full list of generators, refer to the [Generators List](./generators.md).
@@ -84,12 +84,12 @@ For the full list of generators, refer to the [Generators List](./generators.md)
 The `config-help` option provides details about 
 
 ```text
-openapi-generator-cli help config-help
+openapi-json-schema-generator-cli help config-help
 NAME
-        openapi-generator-cli config-help - Config help for chosen lang
+        openapi-json-schema-generator-cli config-help - Config help for chosen lang
 
 SYNOPSIS
-        openapi-generator-cli config-help
+        openapi-json-schema-generator-cli config-help
                 [(-f <output format> | --format <output format>)] [--feature-set]
                 [--full-details]
                 [(-g <generator name> | --generator-name <generator name>)]
@@ -140,7 +140,7 @@ You may pass any generator name (see [list](#list) command) to `-g`, and options
 Example:
 
 ```bash
-openapi-generator-cli config-help -g go
+openapi-json-schema-generator-cli config-help -g go
 ```
 
 Outputs:
@@ -168,14 +168,14 @@ To pass these go client generator-specific options to the `generate` command for
 The `meta` command creates a new Java class and template files, used for creating your own custom templates.
 
 ```text
-openapi-generator-cli help meta
+openapi-json-schema-generator-cli help meta
 NAME
-        openapi-generator-cli meta - MetaGenerator. Generator for creating a new
+        openapi-json-schema-generator-cli meta - MetaGenerator. Generator for creating a new
         template set and configuration for Codegen. The output will be based on
         the language you specify, and includes default templates to include.
 
 SYNOPSIS
-        openapi-generator-cli meta [(-l <language> | --language <language>)]
+        openapi-json-schema-generator-cli meta [(-l <language> | --language <language>)]
                 [(-n <name> | --name <name>)]
                 [(-o <output directory> | --output <output directory>)]
                 [(-p <package> | --package <package>)] [(-t <type> | --type <type>)]
@@ -205,12 +205,12 @@ For an in-depth example of using the `meta` command, see [Customization](./custo
 The `validate` command allows you to validate an input specification, optionally providing recommendations for error fixes or other improvements (if available).
 
 ```text
-openapi-generator-cli help validate
+openapi-json-schema-generator-cli help validate
 NAME
-        openapi-generator-cli validate - Validate specification
+        openapi-json-schema-generator-cli validate - Validate specification
 
 SYNOPSIS
-        openapi-generator-cli validate
+        openapi-json-schema-generator-cli validate
                 (-i <spec file> | --input-spec <spec file>) [--recommend]
 
 OPTIONS
@@ -233,13 +233,13 @@ The `generate` command is the workhorse of the generator toolset. As such, it ha
 
 
 ```text
-openapi-generator-cli help generate
+openapi-json-schema-generator-cli help generate
 NAME
-        openapi-generator-cli generate - Generate code with the specified
+        openapi-json-schema-generator-cli generate - Generate code with the specified
         generator.
 
 SYNOPSIS
-        openapi-generator-cli generate
+        openapi-json-schema-generator-cli generate
                 [(-a <authorization> | --auth <authorization>)]
                 [--api-name-suffix <api name suffix>] [--api-package <api package>]
                 [--artifact-id <artifact id>] [--artifact-version <artifact version>]
@@ -247,24 +247,24 @@ SYNOPSIS
                 [(-e <templating engine> | --engine <templating engine>)]
                 [--enable-post-process-file]
                 [(-g <generator name> | --generator-name <generator name>)]
-                [--generate-alias-as-model] [--git-host <git host>]
-                [--git-repo-id <git repo id>] [--git-user-id <git user id>]
-                [--global-property <global properties>...] [--group-id <group id>]
+                [--git-host <git host>] [--git-repo-id <git repo id>]
+                [--git-user-id <git user id>] [--global-property <global properties>...]
+                [--group-id <group id>] [--hide-generation-timestamp]
                 [--http-user-agent <http user agent>]
                 [(-i <spec file> | --input-spec <spec file>)]
                 [--ignore-file-override <ignore file override location>]
-                [--invoker-package <invoker package>]
-                [--log-to-stderr] [--minimal-update]
+                [--ints-allowed-for-float-double-formats]
+                [--invoker-package <invoker package>] [--minimal-update]
                 [--model-name-prefix <model name prefix>]
                 [--model-name-suffix <model name suffix>]
                 [(-o <output directory> | --output <output directory>)] [(-p <additional properties> | --additional-properties <additional properties>)...]
                 [--package-name <package name>] [--release-note <release note>]
-                [--remove-operation-id-prefix]
-                [(-s | --skip-overwrite)]
-                [--skip-operation-example] [--skip-validate-spec]
-                [--strict-spec <true/false strict behavior>]
+                [--remove-enum-value-prefix] [--remove-operation-id-prefix]
+                [(-s | --skip-overwrite)] [--skip-operation-example]
+                [--skip-validate-spec] [--strict-spec <true/false strict behavior>]
                 [(-t <template directory> | --template-dir <template directory>)]
                 [(-v | --verbose)]
+
 ```
 
 <details>
@@ -306,7 +306,7 @@ OPTIONS
             making changes).
 
         -e <templating engine>, --engine <templating engine>
-            templating engine: "mustache" (default) or "handlebars" (beta)
+            templating engine: "handlebars"(default) or "mustache"
 
         --enable-post-process-file
             Enable post-processing file using environment variables.
@@ -314,14 +314,6 @@ OPTIONS
         -g <generator name>, --generator-name <generator name>
             generator to use (see list command for list)
 
-        --generate-alias-as-model
-            Generate model implementation for aliases to map and array schemas.
-            An 'alias' is an array, map, or list which is defined inline in a
-            OpenAPI document and becomes a model in the generated code. A 'map'
-            schema is an object that can have undeclared properties, i.e. the
-            'additionalproperties' attribute is set on that object. An 'array'
-            schema is a list of sub schemas in a OAS document
-
         --git-host <git host>
             Git host, e.g. gitlab.com.
 
@@ -339,6 +331,9 @@ OPTIONS
         --group-id <group id>
             groupId in generated pom.xml
 
+        --hide-generation-timestamp
+            Hides the generation timestamp when files are generated.
+
         --http-user-agent <http user agent>
             HTTP user agent, e.g. codegen_csharp_api_client, default to
             'OpenAPI-Generator/{packageVersion}/{language}'
@@ -351,15 +346,13 @@ OPTIONS
             Specifies an override location for the .openapi-generator-ignore
             file. Most useful on initial generation.
 
+        --ints-allowed-for-float-double-formats
+            Integers are allowed in for type: number format:float/double
+            payloads
+
         --invoker-package <invoker package>
             root package for generated code
 
-        --log-to-stderr
-            write all log messages (not just errors) to STDOUT. Useful for
-            piping the JSON output of debug options (e.g. `--global-property
-            debugOperations`) to an external parser directly while testing a
-            generator.
-
         --minimal-update
             Only write output files that have changed.
 
@@ -384,6 +377,9 @@ OPTIONS
         --release-note <release note>
             Release note, default to 'Minor update'.
 
+        --remove-enum-value-prefix
+            Remove the common prefix of enum values
+
         --remove-operation-id-prefix
             Remove prefix of operationId, e.g. config_getId => getId
 
@@ -429,7 +425,7 @@ The following examples use [petstore.yaml](https://raw.githubusercontent.com/ope
 Generator-specific options should be passed as `--additional-properties`:
 
 ```bash
-openapi-generator-cli generate -g go --additional-properties=prependFormOrBodyParameters=true \
+openapi-json-schema-generator-cli generate -g go --additional-properties=prependFormOrBodyParameters=true \
     -o out -i petstore.yaml
 ```
 
@@ -466,7 +462,7 @@ For example, one of our typescript samples has the following configuration file:
 These settings can be passed via `-c filename`. Here, we've saved the above as `config.json`:
 
 ```bash
-openapi-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
+openapi-json-schema-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
     -c config.json
 ```
 
@@ -484,7 +480,7 @@ The settings are passed exactly the same as for `config.json`. The most importan
 The name of the file should be `config.yml` or `config.yaml` (in our example it will be `config.yaml`.
 
 ```bash
-openapi-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
+openapi-json-schema-generator-cli generate -i petstore.yaml -g typescript-fetch -o out \
     -c config.yaml
 ```
 
@@ -497,13 +493,13 @@ The `batch` command allows you to move all CLI arguments supported by the `gener
 modified by `--includes-base-dir`. Starting with 5.0.0, the `!batch` command supports multiple `!include` properties, either sequential or nested. In order to support multiple `!include` properties in a JSON file, the property name can have a suffix, e.g. `!include1`, `!include2`, etc. The suffix have no meaning other than providing unique property names.
 
 ```text
-openapi-generator-cli help batch
+openapi-json-schema-generator-cli help batch
 NAME
-        openapi-generator-cli batch - Generate code in batch via external
+        openapi-json-schema-generator-cli batch - Generate code in batch via external
         configs.
 
 SYNOPSIS
-        openapi-generator-cli batch [--clean] [--fail-fast]
+        openapi-json-schema-generator-cli batch [--clean] [--fail-fast]
                 [--includes-base-dir <includes>] [(-r <threads> | --threads <threads>)]
                 [--root-dir <root>] [--timeout <timeout>] [(-v | --verbose)] [--]
                 <configs>...
@@ -569,7 +565,7 @@ additionalProperties:
 EOF
 
 # Generate them
-openapi-generator-cli batch *.yaml
+openapi-json-schema-generator-cli batch *.yaml
 ```
 
 ## author
@@ -577,14 +573,14 @@ openapi-generator-cli batch *.yaml
 This command group contains utilities for authoring generators or customizing templates.
 
 ```text
-openapi-generator-cli help author
+openapi-json-schema-generator-cli help author
 NAME
-        openapi-generator-cli author - Utilities for authoring generators or
+        openapi-json-schema-generator-cli author - Utilities for authoring generators or
         customizing templates.
 
 SYNOPSIS
-        openapi-generator-cli author
-        openapi-generator-cli author template 
+        openapi-json-schema-generator-cli author
+        openapi-json-schema-generator-cli author template 
                 [(-v | --verbose)]
                 [(-o <output directory> | --output <output directory>)]
                 (-g <generator name> | --generator-name <generator name>)
@@ -616,13 +612,13 @@ COMMANDS
 This command allows user to extract templates from the CLI jar which simplifies customization efforts.
 
 ```text
-openapi-generator-cli help author template
+openapi-json-schema-generator-cli help author template
 NAME
-        openapi-generator-cli author template - Retrieve templates for local
+        openapi-json-schema-generator-cli author template - Retrieve templates for local
         modification
 
 SYNOPSIS
-        openapi-generator-cli author template
+        openapi-json-schema-generator-cli author template
                 (-g <generator name> | --generator-name <generator name>)
                 [(-o <output directory> | --output <output directory>)]
                 [(-v | --verbose)]
@@ -643,11 +639,11 @@ Example:
 Extract Java templates, limiting to the `webclient` library.
 
 ```bash
-openapi-generator-cli author template -g java
+openapi-json-schema-generator-cli author template -g java
 ```
 
 Extract all Java templates:
 
 ```bash
-openapi-generator-cli author template -g java
+openapi-json-schema-generator-cli author template -g java
 ```
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
index c45d985d95d..9c2d6dae037 100644
--- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
+++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
@@ -32,7 +32,12 @@ public static class DoubleJsonSchema1 extends JsonSchema<DoubleJsonSchema1Boxed>
 
         protected DoubleJsonSchema1() {
             super(new JsonSchemaInfo()
-                    .type(Set.of(Double.class))
+                    .type(Set.of(
+                            Integer.class,
+                            Long.class,
+                            Float.class,
+                            Double.class
+                    ))
                     .format("double")
             );
         }
diff --git a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
index 06a918eecb0..e8eca2f5307 100644
--- a/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
+++ b/samples/client/3_0_3_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
@@ -32,7 +32,10 @@ public static class FloatJsonSchema1 extends JsonSchema<FloatJsonSchema1Boxed> i
 
         protected FloatJsonSchema1() {
             super(new JsonSchemaInfo()
-                    .type(Set.of(Float.class))
+                    .type(Set.of(
+                            Integer.class,
+                            Float.class
+                    ))
                     .format("float")
             );
         }
diff --git a/samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py b/samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
index f8e53ed1208..04721cd4218 100644
--- a/samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
+++ b/samples/client/3_0_3_unit_test/python/src/unit_test_api/components/schema/invalid_instance_should_not_raise_error_when_float_division_inf.py
@@ -23,6 +23,7 @@ class InvalidInstanceShouldNotRaiseErrorWhenFloatDivisionInf(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     multiple_of: typing.Union[int, float] = 0.123456789
diff --git a/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/schemas.py b/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/schemas.py
index 8b545884c06..2c7d95ca41a 100644
--- a/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/schemas.py
+++ b/samples/client/3_0_3_unit_test/python/src/unit_test_api/schemas/schemas.py
@@ -122,13 +122,13 @@ class Int64Schema(IntSchema):
 
 @dataclasses.dataclass(frozen=True)
 class Float32Schema(NumberSchema):
-    types: typing.FrozenSet[typing.Type] = frozenset({float})
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
     format: str = 'float'
 
 
 @dataclasses.dataclass(frozen=True)
 class Float64Schema(NumberSchema):
-    types: typing.FrozenSet[typing.Type] = frozenset({float})
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
     format: str = 'double'
 
 
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
index c45d985d95d..9c2d6dae037 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/DoubleJsonSchema.java
@@ -32,7 +32,12 @@ public static class DoubleJsonSchema1 extends JsonSchema<DoubleJsonSchema1Boxed>
 
         protected DoubleJsonSchema1() {
             super(new JsonSchemaInfo()
-                    .type(Set.of(Double.class))
+                    .type(Set.of(
+                            Integer.class,
+                            Long.class,
+                            Float.class,
+                            Double.class
+                    ))
                     .format("double")
             );
         }
diff --git a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
index 06a918eecb0..e8eca2f5307 100644
--- a/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
+++ b/samples/client/3_1_0_unit_test/java/src/main/java/org/openapijsonschematools/client/schemas/FloatJsonSchema.java
@@ -32,7 +32,10 @@ public static class FloatJsonSchema1 extends JsonSchema<FloatJsonSchema1Boxed> i
 
         protected FloatJsonSchema1() {
             super(new JsonSchemaInfo()
-                    .type(Set.of(Float.class))
+                    .type(Set.of(
+                            Integer.class,
+                            Float.class
+                    ))
                     .format("float")
             );
         }
diff --git a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/float_division_inf.py b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/float_division_inf.py
index a5b315d19ae..a2379206b2c 100644
--- a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/float_division_inf.py
+++ b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/float_division_inf.py
@@ -23,6 +23,7 @@ class FloatDivisionInf(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     multiple_of: typing.Union[int, float] = 0.123456789
diff --git a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/multiple_types_can_be_specified_in_an_array.py b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/multiple_types_can_be_specified_in_an_array.py
index 625391de087..8253e6571dc 100644
--- a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/multiple_types_can_be_specified_in_an_array.py
+++ b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/multiple_types_can_be_specified_in_an_array.py
@@ -23,6 +23,7 @@ class MultipleTypesCanBeSpecifiedInAnArray(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
         str,
     })
     format: str = 'int'
diff --git a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/not_multiple_types.py b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/not_multiple_types.py
index 380e4ad932f..dbea7f5b7f7 100644
--- a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/not_multiple_types.py
+++ b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/not_multiple_types.py
@@ -18,6 +18,7 @@ class _Not(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
         schemas.Bool,
     })
     format: str = 'int'
diff --git a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/small_multiple_of_large_integer.py b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/small_multiple_of_large_integer.py
index 897b92ba83f..6f853975205 100644
--- a/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/small_multiple_of_large_integer.py
+++ b/samples/client/3_1_0_unit_test/python/src/unit_test_api/components/schema/small_multiple_of_large_integer.py
@@ -23,6 +23,7 @@ class SmallMultipleOfLargeInteger(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     multiple_of: typing.Union[int, float] = 1.0E-8
diff --git a/samples/client/3_1_0_unit_test/python/src/unit_test_api/schemas/schemas.py b/samples/client/3_1_0_unit_test/python/src/unit_test_api/schemas/schemas.py
index e79646f0acd..23c3e06ab3d 100644
--- a/samples/client/3_1_0_unit_test/python/src/unit_test_api/schemas/schemas.py
+++ b/samples/client/3_1_0_unit_test/python/src/unit_test_api/schemas/schemas.py
@@ -122,13 +122,13 @@ class Int64Schema(IntSchema):
 
 @dataclasses.dataclass(frozen=True)
 class Float32Schema(NumberSchema):
-    types: typing.FrozenSet[typing.Type] = frozenset({float})
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
     format: str = 'float'
 
 
 @dataclasses.dataclass(frozen=True)
 class Float64Schema(NumberSchema):
-    types: typing.FrozenSet[typing.Type] = frozenset({float})
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
     format: str = 'double'
 
 
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/array_with_validations_in_items.py b/samples/client/petstore/python/src/petstore_api/components/schema/array_with_validations_in_items.py
index 705422b73fd..70066a57ff0 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/array_with_validations_in_items.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/array_with_validations_in_items.py
@@ -18,6 +18,7 @@ class Items(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int64'
     inclusive_maximum: typing.Union[int, float] = 7
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/enum_test.py b/samples/client/petstore/python/src/petstore_api/components/schema/enum_test.py
index 1b2f1494dae..a5cf4dcb8d2 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/enum_test.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/enum_test.py
@@ -193,6 +193,7 @@ class EnumInteger(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int32'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py b/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
index b8b0c0d990b..3978b331738 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/format_test.py
@@ -18,6 +18,7 @@ class Integer(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     inclusive_maximum: typing.Union[int, float] = 100
@@ -32,6 +33,7 @@ class Int32withValidations(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int32'
     inclusive_maximum: typing.Union[int, float] = 200
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum.py
index 97934960733..2d2e9895611 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum.py
@@ -38,6 +38,7 @@ class IntegerEnum(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_big.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_big.py
index 25f547c402e..aa905af998c 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_big.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_big.py
@@ -38,6 +38,7 @@ class IntegerEnumBig(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_one_value.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_one_value.py
index f5f7f66b110..76aec3de696 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_one_value.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_one_value.py
@@ -30,6 +30,7 @@ class IntegerEnumOneValue(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_with_default_value.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_with_default_value.py
index 06b5345aa1c..521b67af0d7 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_with_default_value.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_enum_with_default_value.py
@@ -38,6 +38,7 @@ class IntegerEnumWithDefaultValue(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_max10.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_max10.py
index d5722cb47a5..c5013a70fd9 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_max10.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_max10.py
@@ -23,6 +23,7 @@ class IntegerMax10(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int64'
     inclusive_maximum: typing.Union[int, float] = 10
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/integer_min15.py b/samples/client/petstore/python/src/petstore_api/components/schema/integer_min15.py
index c15ca62e75a..f5e7530b5a1 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/integer_min15.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/integer_min15.py
@@ -23,6 +23,7 @@ class IntegerMin15(
     """
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int64'
     inclusive_minimum: typing.Union[int, float] = 15
diff --git a/samples/client/petstore/python/src/petstore_api/components/schema/nullable_class.py b/samples/client/petstore/python/src/petstore_api/components/schema/nullable_class.py
index 8ffd6fbca0f..f40d540ad0a 100644
--- a/samples/client/petstore/python/src/petstore_api/components/schema/nullable_class.py
+++ b/samples/client/petstore/python/src/petstore_api/components/schema/nullable_class.py
@@ -55,6 +55,7 @@ class IntegerProp(
     types: typing.FrozenSet[typing.Type] = frozenset({
         type(None),
         int,
+        float,
     })
     format: str = 'int'
 
diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_4/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_4/schema.py
index e5778a4dbe1..21ab35f4945 100644
--- a/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_4/schema.py
+++ b/samples/client/petstore/python/src/petstore_api/paths/fake/get/parameters/parameter_4/schema.py
@@ -29,6 +29,7 @@ class Schema(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int32'
     enum_value_to_name: typing.Mapping[typing.Union[int, float, str, schemas.Bool, None], str] = dataclasses.field(
diff --git a/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py b/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
index abe8330dc39..21728616525 100644
--- a/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
+++ b/samples/client/petstore/python/src/petstore_api/paths/fake/post/request_body/content/application_x_www_form_urlencoded/schema.py
@@ -18,6 +18,7 @@ class Integer(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int'
     inclusive_maximum: typing.Union[int, float] = 100
@@ -30,6 +31,7 @@ class Int32(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int32'
     inclusive_maximum: typing.Union[int, float] = 200
diff --git a/samples/client/petstore/python/src/petstore_api/paths/store_order_order_id/get/parameters/parameter_0/schema.py b/samples/client/petstore/python/src/petstore_api/paths/store_order_order_id/get/parameters/parameter_0/schema.py
index 2fb5e47977f..8e73072eb8c 100644
--- a/samples/client/petstore/python/src/petstore_api/paths/store_order_order_id/get/parameters/parameter_0/schema.py
+++ b/samples/client/petstore/python/src/petstore_api/paths/store_order_order_id/get/parameters/parameter_0/schema.py
@@ -18,6 +18,7 @@ class Schema(
 ):
     types: typing.FrozenSet[typing.Type] = frozenset({
         int,
+        float,
     })
     format: str = 'int64'
     inclusive_maximum: typing.Union[int, float] = 5
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
index f4274134479..9a64141c06a 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/Generate.java
@@ -177,6 +177,10 @@ public class Generate extends AbstractCommand {
             description = CodegenConstants.SKIP_OPERATION_EXAMPLE_DESC)
     private Boolean skipOperationExample;
 
+    @Option(name = {"--ints-allowed-for-float-double-formats"}, title = "allow int payloads when type is number and format is double/float",
+        description = CodegenConstants.INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS_DESC)
+    private Boolean intsAllowedForFloatDoubleFormats;
+
     @Option(name = {"--skip-validate-spec"},
             title = "skip spec validation",
             description = "Skips the default behavior of validating an input specification.")
@@ -327,6 +331,10 @@ public void execute() {
             configurator.setRemoveEnumValuePrefix(removeEnumValuePrefix);
         }
 
+        if (intsAllowedForFloatDoubleFormats != null) {
+            configurator.setIntsAllowedForFloatDoubleFormats(intsAllowedForFloatDoubleFormats);
+        }
+
         if (hideGenerationTimestamp != null) {
             configurator.setHideGenerationTimestamp(hideGenerationTimestamp);
         }
diff --git a/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java b/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java
index d9137be5b87..415fede8734 100644
--- a/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java
+++ b/src/main/java/org/openapijsonschematools/codegen/clicommands/common/Constants.java
@@ -3,7 +3,7 @@
 public class Constants {
     private Constants(){ }
 
-    public static final String CLI_NAME = "openapi-generator-cli";
+    public static final String CLI_NAME = "openapi-json-schema-generator-cli";
     public static final String GIT_REPO = "https://github.com/openapi-json-schema-tools/openapi-json-schema-generator";
     public static final String SITE = "https://openapi-generator.tech/";
 }
diff --git a/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java b/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java
index aa338f15d84..d2841c00721 100644
--- a/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java
+++ b/src/main/java/org/openapijsonschematools/codegen/common/CodegenConstants.java
@@ -364,6 +364,10 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String INIT_REQUIRED_VARS = "initRequiredVars";
     public static final String INIT_REQUIRED_VARS_DESC = "If set to true then the required variables are included as positional arguments in __init__ and _from_openapi_data methods. Note: this can break some composition use cases. To learn more read PR #8802.";
 
+    public static final String INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS = "intsAllowedForFloatDoubleFormats";
+
+    public static final String INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS_DESC = "Integers are allowed in for type: number format:float/double payloads";
+
     public static final String NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS = "nonCompliantUseDiscriminatorIfCompositionFails";
 
     public static final String NON_COMPLIANT_USE_DISCR_IF_COMPOSITION_FAILS_DESC =
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
index 7579588fd71..1372062c08e 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/CodegenConfigurator.java
@@ -326,6 +326,11 @@ public CodegenConfigurator setRemoveEnumValuePrefix(boolean removeEnumValuePrefi
         return this;
     }
 
+    public CodegenConfigurator setIntsAllowedForFloatDoubleFormats(boolean intsAllowedForFloatDoubleFormats) {
+        workflowSettingsBuilder.withIntsAllowedForFloatDoubleFormats(intsAllowedForFloatDoubleFormats);
+        return this;
+    }
+
     public CodegenConfigurator setHideGenerationTimestamp(boolean hideGenerationTimestamp) {
         workflowSettingsBuilder.withHideGenerationTimestamp(hideGenerationTimestamp);
         return this;
diff --git a/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java b/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
index 7768bb5ffdb..82be32da319 100644
--- a/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
+++ b/src/main/java/org/openapijsonschematools/codegen/config/WorkflowSettings.java
@@ -49,6 +49,7 @@ public class WorkflowSettings {
     public static final String DEFAULT_TEMPLATING_ENGINE_NAME = "handlebars";
 
     public static final boolean DEFAULT_HIDE_GENERATION_TIMESTAMP = true;
+    public static final boolean DEFAULT_INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS = false; // TODO in version 5.0.0 release change this to true
     public static final Map<String, String> DEFAULT_GLOBAL_PROPERTIES = Collections.unmodifiableMap(new HashMap<>());
 
     private String inputSpec;
@@ -68,6 +69,7 @@ public class WorkflowSettings {
     private Map<String, ?> globalProperties = DEFAULT_GLOBAL_PROPERTIES;
     private boolean removeEnumValuePrefix = DEFAULT_REMOVE_ENUM_VALUE_PREFIX;
     private Boolean hideGenerationTimestamp = DEFAULT_HIDE_GENERATION_TIMESTAMP;
+    private Boolean intsAllowedForFloatDoubleFormats = DEFAULT_INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS;
 
     private WorkflowSettings(Builder builder) {
         this.inputSpec = builder.inputSpec;
@@ -87,6 +89,7 @@ private WorkflowSettings(Builder builder) {
         this.globalProperties = Collections.unmodifiableMap(builder.globalProperties);
         this.removeEnumValuePrefix = builder.removeEnumValuePrefix;
         this.hideGenerationTimestamp = builder.hideGenerationTimestamp;
+        this.intsAllowedForFloatDoubleFormats = builder.intsAllowedForFloatDoubleFormats;
     }
 
     /**
@@ -121,6 +124,7 @@ public static Builder newBuilder(WorkflowSettings copy) {
         builder.globalProperties = new HashMap<>(copy.getGlobalProperties());
         builder.removeEnumValuePrefix = copy.isRemoveEnumValuePrefix();
         builder.hideGenerationTimestamp = copy.isHideGenerationTimestamp();
+        builder.intsAllowedForFloatDoubleFormats = copy.isIntsAllowedForFloatDoubleFormats();
 
         // force builder "with" methods to invoke side effects
         builder.withTemplateDir(copy.getTemplateDir());
@@ -180,6 +184,9 @@ public boolean isRemoveEnumValuePrefix() {
     }
 
     public boolean isHideGenerationTimestamp() { return hideGenerationTimestamp; }
+
+    public boolean isIntsAllowedForFloatDoubleFormats() { return intsAllowedForFloatDoubleFormats; }
+
     /**
      * Indicates whether or not to skip examples defined in the operation.
      *
@@ -314,7 +321,8 @@ public static final class Builder {
         private String templateDir;
         private String templatingEngineName = DEFAULT_TEMPLATING_ENGINE_NAME;
         private String ignoreFileOverride;
-        private boolean hideGenerationTimestamp = DEFAULT_HIDE_GENERATION_TIMESTAMP;
+        private Boolean hideGenerationTimestamp = DEFAULT_HIDE_GENERATION_TIMESTAMP;
+        private Boolean intsAllowedForFloatDoubleFormats = DEFAULT_INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS;
 
         // NOTE: All collections must be mutable in the builder, and copied to a new immutable collection in .build()
         private Map<String, String> globalProperties = new HashMap<>();
@@ -322,6 +330,12 @@ public static final class Builder {
         private Builder() {
         }
 
+        public Builder withIntsAllowedForFloatDoubleFormats(Boolean intsAllowedForFloatDoubleFormats) {
+            if (intsAllowedForFloatDoubleFormats != null) {
+                this.intsAllowedForFloatDoubleFormats = intsAllowedForFloatDoubleFormats;
+            }
+            return this;
+        }
 
         /**
          * Sets the {@code inputSpec} and returns a reference to this Builder so that the methods can be chained together.
diff --git a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
index 1ea91068f8e..3bf571adaba 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generatorrunner/DefaultGeneratorRunner.java
@@ -368,6 +368,7 @@ private void generateFile(Map<String, Object> templateData, String templateName,
         templateData.putAll(generator.additionalProperties());
         String packageName = generator.generatorSettings().packageName;
         templateData.put("packageName", packageName);
+        templateData.put("generatorSettings", generator.generatorSettings());
         try {
             File written = processTemplateToFile(templateData, templateName, outputFilename, shouldGenerate, skippedByOption);
             if (written != null) {
@@ -877,6 +878,7 @@ private void generateXDocs(List<File> files, String jsonPath, CodegenConstants.J
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
             templateData.put("packageName", generator.generatorSettings().packageName);
+            templateData.put("generatorSettings", generator.generatorSettings());
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -908,6 +910,7 @@ private void generateXTests(List<File> files, String jsonPath, CodegenConstants.
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
             templateData.put("packageName", generator.generatorSettings().packageName);
+            templateData.put("generatorSettings", generator.generatorSettings());
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -944,6 +947,7 @@ private void generateXs(List<File> files, String jsonPath, CodegenConstants.JSON
             HashMap<String, Object> templateData = new HashMap<>();
             templateData.putAll(generator.additionalProperties());
             templateData.put("packageName", generator.generatorSettings().packageName);
+            templateData.put("generatorSettings", generator.generatorSettings());
             templateData.put("modelPackage", generator.modelPackage());
             if (templateInfo != null && !templateInfo.isEmpty()) {
                 templateData.putAll(templateInfo);
@@ -1339,6 +1343,7 @@ Map<String, Object> buildSupportFileBundle(
             CodegenList<CodegenSecurityRequirementObject> security) {
 
         Map<String, Object> bundle = new HashMap<>(generator.additionalProperties());
+        bundle.put("generatorSettings", generator.generatorSettings());
         bundle.put("apiPackage", generator.generatorSettings().apiPackage);
 
         URL url = URLPathUtils.getServerURL(openAPI, null);
diff --git a/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java b/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java
index 8f1a4bfa682..670576e3a6c 100644
--- a/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java
+++ b/src/main/java/org/openapijsonschematools/codegen/generators/models/CodeGeneratorSettings.java
@@ -23,6 +23,7 @@ public class CodeGeneratorSettings {
     public final String inputSpecLocation;  // input spec's location, as URL or file
     public final boolean removeEnumValuePrefix;
     public final boolean hideGenerationTimestamp;
+    public final boolean intsAllowedForFloatDoubleFormats;
     public CodeGeneratorSettings(
         String apiPackage,
         String artifactId,
@@ -40,7 +41,8 @@ public CodeGeneratorSettings(
         String templateEngineName,
         String inputSpecLocation,
         boolean removeEnumValuePrefix,
-        boolean hideGenerationTimestamp
+        boolean hideGenerationTimestamp,
+        boolean intsAllowedForFloatDoubleFormats
     ) {
         this.apiPackage = apiPackage;
         this.artifactId = artifactId;
@@ -59,6 +61,7 @@ public CodeGeneratorSettings(
         this.inputSpecLocation = inputSpecLocation;
         this.removeEnumValuePrefix = removeEnumValuePrefix;
         this.hideGenerationTimestamp = hideGenerationTimestamp;
+        this.intsAllowedForFloatDoubleFormats = intsAllowedForFloatDoubleFormats;
     }
 
     public static CodeGeneratorSettings of(GeneratorSettings generatorSettings, WorkflowSettings workflowSettings, String embeddedTemplateDir, String packageNameDefault, String artifactIdDefault, String outputFolderDefault) {
@@ -79,6 +82,7 @@ public static CodeGeneratorSettings of(GeneratorSettings generatorSettings, Work
         String inputSpecLocation = workflowSettings != null ? workflowSettings.getInputSpec() : null;
         boolean removeEnumValuePrefix = workflowSettings != null ? workflowSettings.isRemoveEnumValuePrefix() : WorkflowSettings.DEFAULT_REMOVE_ENUM_VALUE_PREFIX;
         boolean hideGenerationTimestamp = workflowSettings != null ? workflowSettings.isHideGenerationTimestamp() : WorkflowSettings.DEFAULT_HIDE_GENERATION_TIMESTAMP;
+        boolean intsAllowedForFloatDoubleFormats = workflowSettings != null ? workflowSettings.isIntsAllowedForFloatDoubleFormats() : WorkflowSettings.DEFAULT_INTS_ALLOWED_FOR_FLOAT_DOUBLE_FORMATS;
         return new CodeGeneratorSettings(
             apiPackage,
             artifactId,
@@ -96,7 +100,8 @@ public static CodeGeneratorSettings of(GeneratorSettings generatorSettings, Work
             templateEnginName,
             inputSpecLocation,
             removeEnumValuePrefix,
-            hideGenerationTimestamp
+            hideGenerationTimestamp,
+            intsAllowedForFloatDoubleFormats
         );
     }
 }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/DoubleJsonSchema.hbs b/src/main/resources/java/src/main/java/packagename/schemas/DoubleJsonSchema.hbs
index cdf3dabb960..bc9a5f71a19 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/DoubleJsonSchema.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/DoubleJsonSchema.hbs
@@ -32,7 +32,16 @@ public class DoubleJsonSchema {
 
         protected DoubleJsonSchema1() {
             super(new JsonSchemaInfo()
+        {{#if generatorSettings.intsAllowedForFloatDoubleFormats}}
+                    .type(Set.of(
+                            Integer.class,
+                            Long.class,
+                            Float.class,
+                            Double.class
+                    ))
+        {{else}}
                     .type(Set.of(Double.class))
+        {{/if}}
                     .format("double")
             );
         }
diff --git a/src/main/resources/java/src/main/java/packagename/schemas/FloatJsonSchema.hbs b/src/main/resources/java/src/main/java/packagename/schemas/FloatJsonSchema.hbs
index 4c6e03a0631..40c08d7866d 100644
--- a/src/main/resources/java/src/main/java/packagename/schemas/FloatJsonSchema.hbs
+++ b/src/main/resources/java/src/main/java/packagename/schemas/FloatJsonSchema.hbs
@@ -32,7 +32,14 @@ public class FloatJsonSchema {
 
         protected FloatJsonSchema1() {
             super(new JsonSchemaInfo()
+        {{#if generatorSettings.intsAllowedForFloatDoubleFormats}}
+                    .type(Set.of(
+                            Integer.class,
+                            Float.class
+                    ))
+        {{else}}
                     .type(Set.of(Float.class))
+        {{/if}}
                     .format("float")
             );
         }
diff --git a/src/main/resources/python/components/schemas/schema_cls/_types.hbs b/src/main/resources/python/components/schemas/schema_cls/_types.hbs
index 63d19a6d700..34ce2bd8d97 100644
--- a/src/main/resources/python/components/schemas/schema_cls/_types.hbs
+++ b/src/main/resources/python/components/schemas/schema_cls/_types.hbs
@@ -20,6 +20,7 @@ types: typing.FrozenSet[typing.Type] = frozenset({
 {{/eq}}
 {{#eq this "integer"}}
     int,
+    float,
 {{/eq}}
 {{#eq this "number"}}
     float,
diff --git a/src/main/resources/python/schemas/schemas.hbs b/src/main/resources/python/schemas/schemas.hbs
index 20c5551cb2e..6ecf077ba18 100644
--- a/src/main/resources/python/schemas/schemas.hbs
+++ b/src/main/resources/python/schemas/schemas.hbs
@@ -117,13 +117,21 @@ class Int64Schema(IntSchema):
 
 @dataclasses.dataclass(frozen=True)
 class Float32Schema(NumberSchema):
+{{#if generatorSettings.intsAllowedForFloatDoubleFormats}}
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
+{{else}}
     types: typing.FrozenSet[typing.Type] = frozenset({float})
+{{/if}}
     format: str = 'float'
 
 
 @dataclasses.dataclass(frozen=True)
 class Float64Schema(NumberSchema):
+{{#if generatorSettings.intsAllowedForFloatDoubleFormats}}
+    types: typing.FrozenSet[typing.Type] = frozenset({int, float})
+{{else}}
     types: typing.FrozenSet[typing.Type] = frozenset({float})
+{{/if}}
     format: str = 'double'