diff --git a/RECIPES.md b/RECIPES.md
index 7a3dbdba..8b490551 100644
--- a/RECIPES.md
+++ b/RECIPES.md
@@ -5,7 +5,7 @@ Additional recipes can be found on the [Contrib Recipes Repository](https://gith
 | Package | Latest Recipe | Aliases |
 | --- | --- | --- |
 | [api-platform/admin-pack](https://packagist.org/packages/api-platform/admin-pack) | [1.0](api-platform/admin-pack/1.0) | `api-admin`, `api-platform-admin`, `apiadmin`, `apiplatformadmin`, `react-admin`, `reactadmin` |
-| [api-platform/core](https://packagist.org/packages/api-platform/core) | [3.0](api-platform/core/3.0) |  |
+| [api-platform/core](https://packagist.org/packages/api-platform/core) | [3.1](api-platform/core/3.1) |  |
 | [blackfireio/blackfire-symfony-meta](https://packagist.org/packages/blackfireio/blackfire-symfony-meta) | [1.0](blackfireio/blackfire-symfony-meta/1.0) | `blackfire` |
 | [doctrine/annotations](https://packagist.org/packages/doctrine/annotations) | [1.10](doctrine/annotations/1.10) |  |
 | [doctrine/doctrine-bundle](https://packagist.org/packages/doctrine/doctrine-bundle) | [2.10](doctrine/doctrine-bundle/2.10) |  |
diff --git a/api-platform.core.2.1.json b/api-platform.core.2.1.json
index c111b12d..b1b8fa77 100644
--- a/api-platform.core.2.1.json
+++ b/api-platform.core.2.1.json
@@ -13,13 +13,15 @@
                 },
                 "post-install-output": [
                     "  * Your API is almost ready:",
-                    "    1. Create your first API resource in <info>src/Entity</info>;",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
                     "    2. Go to <info>/api</info> to browse your API",
                     "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
                     "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
                     "    then browse <info>/api/graphql</info>.",
                     "",
-                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>"
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
                 ]
             },
             "files": {
@@ -49,7 +51,7 @@
                     "executable": false
                 }
             },
-            "ref": "d57f9ff8067d8d077f026c4b4700ec876839aed9"
+            "ref": "a8f6478aa07be998567b4db6fe5e89e556e1e9f6"
         }
     }
 }
diff --git a/api-platform.core.2.5.json b/api-platform.core.2.5.json
index 04ced9a5..350812fd 100644
--- a/api-platform.core.2.5.json
+++ b/api-platform.core.2.5.json
@@ -13,13 +13,15 @@
                 },
                 "post-install-output": [
                     "  * Your API is almost ready:",
-                    "    1. Create your first API resource in <info>src/Entity</info>;",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
                     "    2. Go to <info>/api</info> to browse your API",
                     "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
                     "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
                     "    then browse <info>/api/graphql</info>.",
                     "",
-                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>"
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
                 ]
             },
             "files": {
@@ -53,7 +55,7 @@
                     "executable": false
                 }
             },
-            "ref": "05b57782a78c21a664a42055dc11cf1954ca36bb"
+            "ref": "b86557ce5677fa855b1b2608f4a4bc4a8fed8be7"
         }
     }
 }
diff --git a/api-platform.core.3.0.json b/api-platform.core.3.0.json
index fac8c1ce..75c02c74 100644
--- a/api-platform.core.3.0.json
+++ b/api-platform.core.3.0.json
@@ -16,10 +16,12 @@
                     "    1. Create your first API resource in <info>src/ApiResource</info>;",
                     "    2. Go to <info>/api</info> to browse your API",
                     "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
                     "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
                     "    then browse <info>/api/graphql</info>.",
                     "",
-                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs</>"
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
                 ]
             },
             "files": {
@@ -40,7 +42,7 @@
                     "executable": false
                 }
             },
-            "ref": "0330386d716d3eecc52ee5ac66976e733eb8f961"
+            "ref": "4cb2fbb788857f187cab1e6d9df562305d92b20b"
         }
     }
 }
diff --git a/api-platform.core.3.1.json b/api-platform.core.3.1.json
new file mode 100644
index 00000000..e0f4e6cb
--- /dev/null
+++ b/api-platform.core.3.1.json
@@ -0,0 +1,64 @@
+{
+    "manifests": {
+        "api-platform/core": {
+            "manifest": {
+                "bundles": {
+                    "ApiPlatform\\Symfony\\Bundle\\ApiPlatformBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/",
+                    "src/": "%SRC_DIR%/"
+                },
+                "post-install-output": [
+                    "  * Your API is almost ready:",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
+                    "    2. Go to <info>/api</info> to browse your API",
+                    "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
+                    "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
+                    "    then browse <info>/api/graphql</info>.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
+                ]
+            },
+            "files": {
+                "config/packages/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    title: Hello API Platform",
+                        "    version: 1.0.0",
+                        "    # Good defaults for REST APIs",
+                        "    defaults:",
+                        "        stateless: true",
+                        "        cache_headers:",
+                        "            vary: ['Content-Type', 'Authorization', 'Origin']",
+                        "        extra_properties:",
+                        "            standard_put: true",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    resource: .",
+                        "    type: api_platform",
+                        "    prefix: /api",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "src/ApiResource/.gitignore": {
+                    "contents": [
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "adf0c75f4bed8b0043a6680376323404953578c5"
+        }
+    }
+}
diff --git a/archived/api-platform.core/4cb2fbb788857f187cab1e6d9df562305d92b20b.json b/archived/api-platform.core/4cb2fbb788857f187cab1e6d9df562305d92b20b.json
new file mode 100644
index 00000000..75c02c74
--- /dev/null
+++ b/archived/api-platform.core/4cb2fbb788857f187cab1e6d9df562305d92b20b.json
@@ -0,0 +1,48 @@
+{
+    "manifests": {
+        "api-platform/core": {
+            "manifest": {
+                "bundles": {
+                    "ApiPlatform\\Symfony\\Bundle\\ApiPlatformBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/",
+                    "src/": "%SRC_DIR%/"
+                },
+                "post-install-output": [
+                    "  * Your API is almost ready:",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
+                    "    2. Go to <info>/api</info> to browse your API",
+                    "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
+                    "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
+                    "    then browse <info>/api/graphql</info>.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
+                ]
+            },
+            "files": {
+                "config/routes/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    resource: .",
+                        "    type: api_platform",
+                        "    prefix: /api",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "src/ApiResource/.gitignore": {
+                    "contents": [
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "4cb2fbb788857f187cab1e6d9df562305d92b20b"
+        }
+    }
+}
diff --git a/archived/api-platform.core/a8f6478aa07be998567b4db6fe5e89e556e1e9f6.json b/archived/api-platform.core/a8f6478aa07be998567b4db6fe5e89e556e1e9f6.json
new file mode 100644
index 00000000..b1b8fa77
--- /dev/null
+++ b/archived/api-platform.core/a8f6478aa07be998567b4db6fe5e89e556e1e9f6.json
@@ -0,0 +1,57 @@
+{
+    "manifests": {
+        "api-platform/core": {
+            "manifest": {
+                "bundles": {
+                    "ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\ApiPlatformBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/",
+                    "src/": "%SRC_DIR%/"
+                },
+                "post-install-output": [
+                    "  * Your API is almost ready:",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
+                    "    2. Go to <info>/api</info> to browse your API",
+                    "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
+                    "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
+                    "    then browse <info>/api/graphql</info>.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
+                ]
+            },
+            "files": {
+                "config/packages/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    mapping:",
+                        "        paths: ['%kernel.project_dir%/src/Entity']",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    resource: .",
+                        "    type: api_platform",
+                        "    prefix: /api",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "src/Entity/.gitignore": {
+                    "contents": [
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "a8f6478aa07be998567b4db6fe5e89e556e1e9f6"
+        }
+    }
+}
diff --git a/archived/api-platform.core/adf0c75f4bed8b0043a6680376323404953578c5.json b/archived/api-platform.core/adf0c75f4bed8b0043a6680376323404953578c5.json
new file mode 100644
index 00000000..e0f4e6cb
--- /dev/null
+++ b/archived/api-platform.core/adf0c75f4bed8b0043a6680376323404953578c5.json
@@ -0,0 +1,64 @@
+{
+    "manifests": {
+        "api-platform/core": {
+            "manifest": {
+                "bundles": {
+                    "ApiPlatform\\Symfony\\Bundle\\ApiPlatformBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/",
+                    "src/": "%SRC_DIR%/"
+                },
+                "post-install-output": [
+                    "  * Your API is almost ready:",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
+                    "    2. Go to <info>/api</info> to browse your API",
+                    "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
+                    "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
+                    "    then browse <info>/api/graphql</info>.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
+                ]
+            },
+            "files": {
+                "config/packages/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    title: Hello API Platform",
+                        "    version: 1.0.0",
+                        "    # Good defaults for REST APIs",
+                        "    defaults:",
+                        "        stateless: true",
+                        "        cache_headers:",
+                        "            vary: ['Content-Type', 'Authorization', 'Origin']",
+                        "        extra_properties:",
+                        "            standard_put: true",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    resource: .",
+                        "    type: api_platform",
+                        "    prefix: /api",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "src/ApiResource/.gitignore": {
+                    "contents": [
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "adf0c75f4bed8b0043a6680376323404953578c5"
+        }
+    }
+}
diff --git a/archived/api-platform.core/b86557ce5677fa855b1b2608f4a4bc4a8fed8be7.json b/archived/api-platform.core/b86557ce5677fa855b1b2608f4a4bc4a8fed8be7.json
new file mode 100644
index 00000000..350812fd
--- /dev/null
+++ b/archived/api-platform.core/b86557ce5677fa855b1b2608f4a4bc4a8fed8be7.json
@@ -0,0 +1,61 @@
+{
+    "manifests": {
+        "api-platform/core": {
+            "manifest": {
+                "bundles": {
+                    "ApiPlatform\\Core\\Bridge\\Symfony\\Bundle\\ApiPlatformBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/",
+                    "src/": "%SRC_DIR%/"
+                },
+                "post-install-output": [
+                    "  * Your API is almost ready:",
+                    "    1. Create your first API resource in <info>src/ApiResource</info>;",
+                    "    2. Go to <info>/api</info> to browse your API",
+                    "",
+                    "  * Using MakerBundle? Try <info>php bin/console make:entity --api-resource</info> ",
+                    "",
+                    "  * To enable the GraphQL support, run <comment>composer require webonyx/graphql-php</>,",
+                    "    then browse <info>/api/graphql</info>.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://api-platform.com/docs/</>"
+                ]
+            },
+            "files": {
+                "config/packages/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    mapping:",
+                        "        paths: ['%kernel.project_dir%/src/Entity']",
+                        "    patch_formats:",
+                        "        json: ['application/merge-patch+json']",
+                        "    swagger:",
+                        "        versions: [3]",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/api_platform.yaml": {
+                    "contents": [
+                        "api_platform:",
+                        "    resource: .",
+                        "    type: api_platform",
+                        "    prefix: /api",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "src/Entity/.gitignore": {
+                    "contents": [
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "b86557ce5677fa855b1b2608f4a4bc4a8fed8be7"
+        }
+    }
+}
diff --git a/index.json b/index.json
index 02a1146a..76dbaee0 100644
--- a/index.json
+++ b/index.json
@@ -461,7 +461,8 @@
         "api-platform/core": [
             "2.1",
             "2.5",
-            "3.0"
+            "3.0",
+            "3.1"
         ],
         "blackfireio/blackfire-symfony-meta": [
             "1.0"