diff --git a/RECIPES.md b/RECIPES.md
index b75e9bd9..7de39bf4 100644
--- a/RECIPES.md
+++ b/RECIPES.md
@@ -227,7 +227,7 @@ Additional recipes can be found on the [Main Recipes Repository](https://github.
 | [holadev/amp-toolbox-bundle](https://packagist.org/packages/holadev/amp-toolbox-bundle) | [0.1](holadev/amp-toolbox-bundle/0.1) |
 | [horlyk/fetch-xml-bundle](https://packagist.org/packages/horlyk/fetch-xml-bundle) | [1.1](horlyk/fetch-xml-bundle/1.1) |
 | [hugosoltys/fitz-bundle](https://packagist.org/packages/hugosoltys/fitz-bundle) | [1.0](hugosoltys/fitz-bundle/1.0) |
-| [hwi/oauth-bundle](https://packagist.org/packages/hwi/oauth-bundle) | [0.6](hwi/oauth-bundle/0.6) |
+| [hwi/oauth-bundle](https://packagist.org/packages/hwi/oauth-bundle) | [2.0](hwi/oauth-bundle/2.0) |
 | [idci/keycloak-security-bundle](https://packagist.org/packages/idci/keycloak-security-bundle) | [2.0](idci/keycloak-security-bundle/2.0) |
 | [ijanki/prometheus-bundle](https://packagist.org/packages/ijanki/prometheus-bundle) | [0.9](ijanki/prometheus-bundle/0.9) |
 | [ikoene/marvel-api-bundle](https://packagist.org/packages/ikoene/marvel-api-bundle) | [0.5](ikoene/marvel-api-bundle/0.5) |
diff --git a/archived/hwi.oauth-bundle/20154480d558409ad3eb9de3644817c81fad2268.json b/archived/hwi.oauth-bundle/20154480d558409ad3eb9de3644817c81fad2268.json
new file mode 100644
index 00000000..e47502a8
--- /dev/null
+++ b/archived/hwi.oauth-bundle/20154480d558409ad3eb9de3644817c81fad2268.json
@@ -0,0 +1,71 @@
+{
+    "manifests": {
+        "hwi/oauth-bundle": {
+            "manifest": {
+                "bundles": {
+                    "HWI\\Bundle\\OAuthBundle\\HWIOAuthBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/"
+                },
+                "env": {
+                    "FB_ID": "",
+                    "FB_SECRET": ""
+                },
+                "post-install-output": [
+                    "  * <fg=blue>Configure</> your application:",
+                    "    1. Add firewall by adding <comment>- main:",
+                    "                                             anonymous: true",
+                    "                                             oauth:",
+                    "                                                 resource_owners:",
+                    "                                                     my_github:     \"/login/check-github\"",
+                    "                                                 login_path:        /login",
+                    "                                                 use_forward:       false",
+                    "                                                 failure_path:      /login",
+                    "",
+                    "                                                 oauth_user_provider:",
+                    "                                                     service: hwi_oauth.user.provider",
+                    "</> in your security firewalls section.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://github.com/hwi/HWIOAuthBundle/blob/master/docs/3-configuring_the_security_layer.md</>"
+                ]
+            },
+            "files": {
+                "config/packages/hwi_oauth.yaml": {
+                    "contents": [
+                        "hwi_oauth:",
+                        "    # https://github.com/hwi/HWIOAuthBundle/blob/master/docs/2-configuring_resource_owners.md",
+                        "    resource_owners:",
+                        "        facebook:",
+                        "            type:                facebook",
+                        "            client_id:           '%env(FB_ID)%'",
+                        "            client_secret:       '%env(FB_SECRET)%'",
+                        "            scope:               \"email public_profile\"",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/hwi_oauth_routing.yaml": {
+                    "contents": [
+                        "hwi_oauth_redirect:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/redirect.php\"",
+                        "    prefix:   /connect",
+                        "",
+                        "hwi_oauth_connect:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/connect.php\"",
+                        "    prefix:   /connect",
+                        "",
+                        "hwi_oauth_login:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/login.php\"",
+                        "    prefix:   /login",
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "20154480d558409ad3eb9de3644817c81fad2268"
+        }
+    }
+}
diff --git a/hwi.oauth-bundle.2.0.json b/hwi.oauth-bundle.2.0.json
new file mode 100644
index 00000000..e47502a8
--- /dev/null
+++ b/hwi.oauth-bundle.2.0.json
@@ -0,0 +1,71 @@
+{
+    "manifests": {
+        "hwi/oauth-bundle": {
+            "manifest": {
+                "bundles": {
+                    "HWI\\Bundle\\OAuthBundle\\HWIOAuthBundle": [
+                        "all"
+                    ]
+                },
+                "copy-from-recipe": {
+                    "config/": "%CONFIG_DIR%/"
+                },
+                "env": {
+                    "FB_ID": "",
+                    "FB_SECRET": ""
+                },
+                "post-install-output": [
+                    "  * <fg=blue>Configure</> your application:",
+                    "    1. Add firewall by adding <comment>- main:",
+                    "                                             anonymous: true",
+                    "                                             oauth:",
+                    "                                                 resource_owners:",
+                    "                                                     my_github:     \"/login/check-github\"",
+                    "                                                 login_path:        /login",
+                    "                                                 use_forward:       false",
+                    "                                                 failure_path:      /login",
+                    "",
+                    "                                                 oauth_user_provider:",
+                    "                                                     service: hwi_oauth.user.provider",
+                    "</> in your security firewalls section.",
+                    "",
+                    "  * <fg=blue>Read</> the documentation at <comment>https://github.com/hwi/HWIOAuthBundle/blob/master/docs/3-configuring_the_security_layer.md</>"
+                ]
+            },
+            "files": {
+                "config/packages/hwi_oauth.yaml": {
+                    "contents": [
+                        "hwi_oauth:",
+                        "    # https://github.com/hwi/HWIOAuthBundle/blob/master/docs/2-configuring_resource_owners.md",
+                        "    resource_owners:",
+                        "        facebook:",
+                        "            type:                facebook",
+                        "            client_id:           '%env(FB_ID)%'",
+                        "            client_secret:       '%env(FB_SECRET)%'",
+                        "            scope:               \"email public_profile\"",
+                        ""
+                    ],
+                    "executable": false
+                },
+                "config/routes/hwi_oauth_routing.yaml": {
+                    "contents": [
+                        "hwi_oauth_redirect:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/redirect.php\"",
+                        "    prefix:   /connect",
+                        "",
+                        "hwi_oauth_connect:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/connect.php\"",
+                        "    prefix:   /connect",
+                        "",
+                        "hwi_oauth_login:",
+                        "    resource: \"@HWIOAuthBundle/Resources/config/routing/login.php\"",
+                        "    prefix:   /login",
+                        ""
+                    ],
+                    "executable": false
+                }
+            },
+            "ref": "20154480d558409ad3eb9de3644817c81fad2268"
+        }
+    }
+}
diff --git a/index.json b/index.json
index 7cb99014..227c2d7a 100644
--- a/index.json
+++ b/index.json
@@ -711,7 +711,8 @@
             "1.0"
         ],
         "hwi/oauth-bundle": [
-            "0.6"
+            "0.6",
+            "2.0"
         ],
         "idci/keycloak-security-bundle": [
             "1.0",