diff --git a/.copier-answers.yml b/.copier-answers.yml
index 5ce9f54..dda39c7 100644
--- a/.copier-answers.yml
+++ b/.copier-answers.yml
@@ -1,17 +1,19 @@
 # Do NOT update manually; changes here will be overwritten by Copier
-_commit: v1.14.1
+_commit: v1.20
 _src_path: https://github.com/OCA/oca-addons-repo-template.git
+additional_ruff_rules: []
 ci: GitHub
-dependency_installation_mode: PIP
+convert_readme_fragments_to_markdown: false
 generate_requirements_txt: true
-github_check_license: true
+github_check_license: false
 github_ci_extra_env: {}
-github_enable_codecov: false
+github_enable_codecov: true
 github_enable_makepot: true
 github_enable_stale_action: false
-github_enforce_dev_status_compatibility: true
+github_enforce_dev_status_compatibility: false
 include_wkhtmltopdf: false
-odoo_version: 15.0
+odoo_test_flavor: Both
+odoo_version: 17.0
 org_name: OpenG2P
 org_slug: OpenG2P
 rebel_module_groups: []
@@ -19,6 +21,6 @@ repo_description: This repo is contains modules used by OpenG2P for Security
 repo_name: OpenG2P Security
 repo_slug: openg2p-security
 repo_website: https://github.com/OpenG2P/openg2p-security
-travis_apt_packages: []
-travis_apt_sources: []
+use_pyproject_toml: true
+use_ruff: true
 
diff --git a/.eslintrc.yml b/.eslintrc.yml
index 1ba4002..fed88d7 100644
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@@ -9,7 +9,6 @@ parserOptions:
 overrides:
   - files:
       - "**/*.esm.js"
-      - "**/*.js"
     parserOptions:
       sourceType: module
 
@@ -23,6 +22,7 @@ globals:
   odoo: readonly
   openerp: readonly
   owl: readonly
+  luxon: readonly
 
 # Styling is handled by Prettier, so we only need to enable AST rules;
 # see https://github.com/OCA/maintainer-quality-tools/pull/618#issuecomment-558576890
diff --git a/.flake8 b/.flake8
deleted file mode 100644
index ff1c593..0000000
--- a/.flake8
+++ /dev/null
@@ -1,12 +0,0 @@
-[flake8]
-max-line-length = 110
-max-complexity = 16
-# B = bugbear
-# B9 = bugbear opinionated (incl line length)
-select = C,E,F,W,B,B9
-# E203: whitespace before ':' (black behaviour)
-# E501: flake8 line length (covered by bugbear B950)
-# W503: line break before binary operator (black behaviour)
-ignore = E203,E501,W503
-per-file-ignores=
-    __init__.py:F401
diff --git a/.gitignore b/.gitignore
index 9c283fd..0090721 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@ __pycache__/
 *.py[cod]
 /.venv
 /.pytest_cache
+/.ruff_cache
 
 # C extensions
 *.so
diff --git a/.isort.cfg b/.isort.cfg
deleted file mode 100644
index 1a48ae4..0000000
--- a/.isort.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-[settings]
-; see https://github.com/psf/black
-multi_line_output=3
-include_trailing_comma=True
-force_grid_wrap=0
-combine_as_imports=True
-use_parentheses=True
-line_length=110
-known_odoo=odoo
-known_odoo_addons=odoo.addons
-sections=FUTURE,STDLIB,THIRDPARTY,ODOO,ODOO_ADDONS,FIRSTPARTY,LOCALFOLDER
-default_section=THIRDPARTY
-ensure_newline_before_comments = True
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ce9d079..a3ce425 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,11 +12,15 @@ exclude: |
   /static/(src/)?lib/|
   # Repos using Sphinx to generate docs don't need prettying
   ^docs/_templates/.*\.html$|
+  # Don't bother non-technical authors with formatting issues in docs
+  readme/.*\.(rst|md)$|
+  # Ignore build and dist directories in addons
+  /build/|/dist/|
   # You don't usually want a bot to modify your legal texts
   (LICENSE.*|COPYING.*)
 default_language_version:
   python: python3
-  node: "14.18.0"
+  node: "16.17.0"
 repos:
   - repo: local
     hooks:
@@ -27,6 +31,15 @@ repos:
         entry: found forbidden files; remove them
         language: fail
         files: "\\.rej$"
+      - id: en-po-files
+        name: en.po files cannot exist
+        entry: found a en.po file
+        language: fail
+        files: '[a-zA-Z0-9_]*/i18n/en\.po$'
+  - repo: https://github.com/sbidoul/whool
+    rev: v0.5
+    hooks:
+      - id: whool-init
   - repo: https://github.com/oca/maintainer-tools
     rev: 9a170331575a265c092ee6b24b845ec508e8ef75
     hooks:
@@ -37,42 +50,30 @@ repos:
       - id: oca-gen-addon-readme
         args:
           - --addons-dir=.
-          - --branch=15.0-develop
+          - --branch=17.0-develop
           - --org-name=OpenG2P
           - --repo-name=openg2p-security
           - --if-source-changed
           - --keep-source-digest
       - id: oca-gen-external-dependencies
-  - repo: https://github.com/myint/autoflake
-    rev: v1.4
+  - repo: https://github.com/OCA/odoo-pre-commit-hooks
+    rev: v0.0.25
     hooks:
-      - id: autoflake
-        args:
-          - --expand-star-imports
-          - --ignore-init-module-imports
-          - --in-place
-          - --remove-all-unused-imports
-          - --remove-duplicate-keys
-          - --remove-unused-variables
-  - repo: https://github.com/psf/black
-    rev: 22.3.0
-    hooks:
-      - id: black
-        args:
-          - --line-length=110
+      - id: oca-checks-odoo-module
+      - id: oca-checks-po
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.4.1
+    rev: v2.7.1
     hooks:
       - id: prettier
         name: prettier (with plugin-xml)
         additional_dependencies:
-          - "prettier@2.4.1"
-          - "@prettier/plugin-xml@1.1.0"
+          - "prettier@2.7.1"
+          - "@prettier/plugin-xml@2.2.0"
         args:
           - --plugin=@prettier/plugin-xml
         files: \.(css|htm|html|js|json|jsx|less|md|scss|toml|ts|xml|yaml|yml)$
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: v7.32.0
+    rev: v8.24.0
     hooks:
       - id: eslint
         verbose: true
@@ -80,7 +81,7 @@ repos:
           - --color
           - --fix
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
         # exclude autogenerated files
@@ -101,31 +102,14 @@ repos:
       - id: check-xml
       - id: mixed-line-ending
         args: ["--fix=lf"]
-  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.0
-    hooks:
-      - id: pyupgrade
-        args: ["--keep-percent-format"]
-  - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
-    hooks:
-      - id: isort
-        name: isort except __init__.py
-        args:
-          - --settings=.
-        exclude: /__init__\.py$
-  - repo: https://github.com/acsone/setuptools-odoo
-    rev: 3.1.8
-    hooks:
-      - id: setuptools-odoo-make-default
-  - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.1.3
     hooks:
-      - id: flake8
-        name: flake8
-        additional_dependencies: ["flake8-bugbear==21.9.2"]
+      - id: ruff
+        args: [--fix, --exit-non-zero-on-fix]
+      - id: ruff-format
   - repo: https://github.com/OCA/pylint-odoo
-    rev: 7.0.2
+    rev: v9.0.4
     hooks:
       - id: pylint_odoo
         name: pylint with optional checks
diff --git a/.pylintrc b/.pylintrc
index ad019e5..5ffeaa7 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -5,12 +5,12 @@ load-plugins=pylint_odoo
 score=n
 
 [ODOOLINT]
-readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
-manifest_required_authors=OpenG2P
-manifest_required_keys=license
-manifest_deprecated_keys=description,active
-license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
-valid_odoo_versions=15.0
+readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest-required-authors=OpenG2P
+manifest-required-keys=license
+manifest-deprecated-keys=description,active
+license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
+valid-odoo-versions=17.0
 
 [MESSAGES CONTROL]
 disable=all
@@ -98,6 +98,7 @@ enable=anomalous-backslash-in-string,
     xml-attribute-translatable,
     xml-deprecated-qweb-directive,
     xml-deprecated-tree-attribute,
+    external-request-timeout,
     # messages that do not cause the lint step to fail
     consider-merging-classes-inherited,
     create-user-wo-reset-password,
diff --git a/.pylintrc-mandatory b/.pylintrc-mandatory
index 09754a1..27076d0 100644
--- a/.pylintrc-mandatory
+++ b/.pylintrc-mandatory
@@ -4,12 +4,12 @@ load-plugins=pylint_odoo
 score=n
 
 [ODOOLINT]
-readme_template_url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
-manifest_required_authors=OpenG2P
-manifest_required_keys=license
-manifest_deprecated_keys=description,active
-license_allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
-valid_odoo_versions=15.0
+readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/template/module/README.rst"
+manifest-required-authors=OpenG2P
+manifest-required-keys=license
+manifest-deprecated-keys=description,active
+license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
+valid-odoo-versions=17.0
 
 [MESSAGES CONTROL]
 disable=all
@@ -89,7 +89,8 @@ enable=anomalous-backslash-in-string,
     website-manifest-key-not-valid-uri,
     xml-attribute-translatable,
     xml-deprecated-qweb-directive,
-    xml-deprecated-tree-attribute
+    xml-deprecated-tree-attribute,
+    external-request-timeout
 
 [REPORTS]
 msg-template={path}:{line}: [{msg_id}({symbol}), {obj}] {msg}
diff --git a/.ruff.toml b/.ruff.toml
new file mode 100644
index 0000000..8511d42
--- /dev/null
+++ b/.ruff.toml
@@ -0,0 +1,31 @@
+
+target-version = "py310"
+fix = true
+line-length = 110
+
+[lint]
+extend-select = [
+    "B",
+    "C90",
+    "E501",  # line too long (default 88)
+    "I",  # isort
+    "UP",  # pyupgrade
+]
+exclude = ["setup/*"]
+
+[format]
+exclude = ["setup/*"]
+
+[per-file-ignores]
+"__init__.py" = ["F401", "I001"]  # ignore unused and unsorted imports in __init__.py
+"__manifest__.py" = ["B018"]  # useless expression
+
+[isort]
+section-order = ["future", "standard-library", "third-party", "odoo", "odoo-addons", "first-party", "local-folder"]
+
+[isort.sections]
+"odoo" = ["odoo"]
+"odoo-addons" = ["odoo.addons"]
+
+[mccabe]
+max-complexity = 16
diff --git a/README.md b/README.md
index 6e9773e..8689ff9 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 
 <!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
-[![Pre-commit Status](https://github.com/OpenG2P/openg2p-security/actions/workflows/pre-commit.yml/badge.svg?branch=15.0-develop)](https://github.com/OpenG2P/openg2p-security/actions/workflows/pre-commit.yml?query=branch%3A15.0-develop)
-[![Build Status](https://github.com/OpenG2P/openg2p-security/actions/workflows/test.yml/badge.svg?branch=15.0-develop)](https://github.com/OpenG2P/openg2p-security/actions/workflows/test.yml?query=branch%3A15.0-develop)
-[![codecov](https://codecov.io/gh/OpenG2P/openg2p-security/branch/15.0-develop/graph/badge.svg)](https://codecov.io/gh/OpenG2P/openg2p-security)
+[![Pre-commit Status](https://github.com/OpenG2P/openg2p-security/actions/workflows/pre-commit.yml/badge.svg?branch=17.0-develop)](https://github.com/OpenG2P/openg2p-security/actions/workflows/pre-commit.yml?query=branch%3A17.0-develop)
+[![Build Status](https://github.com/OpenG2P/openg2p-security/actions/workflows/test.yml/badge.svg?branch=17.0-develop)](https://github.com/OpenG2P/openg2p-security/actions/workflows/test.yml?query=branch%3A17.0-develop)
+[![codecov](https://codecov.io/gh/OpenG2P/openg2p-security/branch/17.0-develop/graph/badge.svg)](https://codecov.io/gh/OpenG2P/openg2p-security)
 <!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->
 
 <!-- /!\ do not modify above this line -->
@@ -22,10 +22,10 @@ Available addons
 ----------------
 addon | version | maintainers | summary
 --- | --- | --- | ---
-[g2p_encryption](g2p_encryption/) | 15.0.1.2.0 |  | G2P Encryption: Base
-[g2p_encryption_keymanager](g2p_encryption_keymanager/) | 15.0.1.2.0 |  | G2P Encryption: Keymanager
-[g2p_encryption_rest_api](g2p_encryption_rest_api/) | 15.0.1.2.0 |  | G2P Encryption: Rest API
-[g2p_registry_encryption](g2p_registry_encryption/) | 15.0.1.2.0 |  | G2P Registry: Encryption
+[g2p_encryption](g2p_encryption/) | 17.0.1.2.0 |  | G2P Encryption: Base
+[g2p_encryption_keymanager](g2p_encryption_keymanager/) | 17.0.1.2.0 |  | G2P Encryption: Keymanager
+[g2p_encryption_rest_api](g2p_encryption_rest_api/) | 17.0.1.2.0 |  | G2P Encryption: Rest API
+[g2p_registry_encryption](g2p_registry_encryption/) | 17.0.1.2.0 |  | G2P Registry: Encryption
 
 [//]: # (end addons)
 
diff --git a/g2p_encryption/README.rst b/g2p_encryption/README.rst
index 5e48d46..3f5101c 100644
--- a/g2p_encryption/README.rst
+++ b/g2p_encryption/README.rst
@@ -7,14 +7,14 @@ G2P Encryption: Base
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:2be24ba9e884952b98191815e8482ee2169686beba08fd5546a637202264487a
+   !! source digest: sha256:63403b39665dc57a132ba0ea64a6bb847f291abdea932f393ff6411054b19f54
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption
+    :target: https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption
     :alt: OpenG2P/openg2p-security
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -58,6 +58,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_encryption/__manifest__.py b/g2p_encryption/__manifest__.py
index d91e065..4b5931a 100644
--- a/g2p_encryption/__manifest__.py
+++ b/g2p_encryption/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "G2P Encryption: Base",
     "category": "G2P",
-    "version": "15.0.1.2.0",
+    "version": "17.0.1.2.0",
     "sequence": 1,
     "author": "OpenG2P",
     "website": "https://openg2p.org",
diff --git a/g2p_encryption/i18n/g2p_encryption.pot b/g2p_encryption/i18n/g2p_encryption.pot
deleted file mode 100644
index 011485c..0000000
--- a/g2p_encryption/i18n/g2p_encryption.pot
+++ /dev/null
@@ -1,90 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* g2p_encryption
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: g2p_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_encryption.view_encryption_provider_form
-msgid "Base"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__create_date
-msgid "Created on"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:res.groups,name:g2p_encryption.crypto_admin
-msgid "Crypto Admin"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.actions.act_window,name:g2p_encryption.action_encryption_provider
-#: model_terms:ir.ui.view,arch_db:g2p_encryption.view_encryption_provider_form
-msgid "Encryption Provider"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.ui.menu,name:g2p_encryption.menu_encryption_provider
-msgid "Encryption Providers"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model,name:g2p_encryption.model_g2p_encryption_provider
-msgid "G2P Encryption Provider"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__id
-msgid "ID"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider____last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: g2p_encryption
-#: model_terms:ir.actions.act_window,help:g2p_encryption.action_encryption_provider
-msgid "Manage encryption providers."
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__name
-msgid "Name"
-msgstr ""
-
-#. module: g2p_encryption
-#: model:ir.model.fields,field_description:g2p_encryption.field_g2p_encryption_provider__type
-msgid "Type"
-msgstr ""
diff --git a/g2p_encryption/pyproject.toml b/g2p_encryption/pyproject.toml
new file mode 100644
index 0000000..4231d0c
--- /dev/null
+++ b/g2p_encryption/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/g2p_encryption/static/description/index.html b/g2p_encryption/static/description/index.html
index 7ec4129..1da674a 100644
--- a/g2p_encryption/static/description/index.html
+++ b/g2p_encryption/static/description/index.html
@@ -366,9 +366,9 @@ <h1 class="title">G2P Encryption: Base</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:2be24ba9e884952b98191815e8482ee2169686beba08fd5546a637202264487a
+!! source digest: sha256:63403b39665dc57a132ba0ea64a6bb847f291abdea932f393ff6411054b19f54
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
 <p>OpenG2P Encryption: Base</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -413,7 +413,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption">OpenG2P/openg2p-security</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption">OpenG2P/openg2p-security</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_encryption_keymanager/README.rst b/g2p_encryption_keymanager/README.rst
index d0a1239..a5ee123 100644
--- a/g2p_encryption_keymanager/README.rst
+++ b/g2p_encryption_keymanager/README.rst
@@ -7,14 +7,14 @@ G2P Encryption: Keymanager
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:c5b90c4b58fa786333889d2061bb9fe6d3eb8eb89ba9384b3c37d72d094f71ad
+   !! source digest: sha256:655d43e4a6c6164c46570eac57b66a8a87aff88e6d6c16fc2b2a8447f48b0a0a
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_keymanager
+    :target: https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_keymanager
     :alt: OpenG2P/openg2p-security
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_keymanager%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_keymanager%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -58,6 +58,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_keymanager>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_keymanager>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_encryption_keymanager/__manifest__.py b/g2p_encryption_keymanager/__manifest__.py
index ddd6d05..c99cc37 100644
--- a/g2p_encryption_keymanager/__manifest__.py
+++ b/g2p_encryption_keymanager/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "G2P Encryption: Keymanager",
     "category": "G2P",
-    "version": "15.0.1.2.0",
+    "version": "17.0.1.2.0",
     "sequence": 1,
     "author": "OpenG2P",
     "website": "https://openg2p.org",
diff --git a/g2p_encryption_keymanager/i18n/g2p_encryption_keymanager.pot b/g2p_encryption_keymanager/i18n/g2p_encryption_keymanager.pot
deleted file mode 100644
index d7d83e3..0000000
--- a/g2p_encryption_keymanager/i18n/g2p_encryption_keymanager.pot
+++ /dev/null
@@ -1,104 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* g2p_encryption_keymanager
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model,name:g2p_encryption_keymanager.model_g2p_encryption_provider
-msgid "G2P Encryption Provider"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields.selection,name:g2p_encryption_keymanager.selection__g2p_encryption_provider__type__keymanager
-msgid "Keymanager"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_access_token
-msgid "Keymanager Access Token"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_access_token_expiry
-msgid "Keymanager Access Token Expiry"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model_terms:ir.ui.view,arch_db:g2p_encryption_keymanager.view_keymanager_encryption_provider_form
-msgid "Keymanager Additional Settings"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_api_base_url
-msgid "Keymanager Api Base Url"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_auth_client_id
-msgid "Keymanager Auth Client"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_auth_client_secret
-msgid "Keymanager Auth Client Secret"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_auth_grant_type
-msgid "Keymanager Auth Grant Type"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_auth_url
-msgid "Keymanager Auth Url"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_encrypt_aad
-msgid "Keymanager Encrypt Aad"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_encrypt_application_id
-msgid "Keymanager Encrypt Application"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_encrypt_reference_id
-msgid "Keymanager Encrypt Reference"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_encrypt_salt
-msgid "Keymanager Encrypt Salt"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model_terms:ir.ui.view,arch_db:g2p_encryption_keymanager.view_keymanager_encryption_provider_form
-msgid "Keymanager Settings"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_sign_application_id
-msgid "Keymanager Sign Application"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__keymanager_sign_reference_id
-msgid "Keymanager Sign Reference"
-msgstr ""
-
-#. module: g2p_encryption_keymanager
-#: model:ir.model.fields,field_description:g2p_encryption_keymanager.field_g2p_encryption_provider__type
-msgid "Type"
-msgstr ""
diff --git a/g2p_encryption_keymanager/pyproject.toml b/g2p_encryption_keymanager/pyproject.toml
new file mode 100644
index 0000000..4231d0c
--- /dev/null
+++ b/g2p_encryption_keymanager/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/g2p_encryption_keymanager/static/description/index.html b/g2p_encryption_keymanager/static/description/index.html
index 3425e96..ef00bc0 100644
--- a/g2p_encryption_keymanager/static/description/index.html
+++ b/g2p_encryption_keymanager/static/description/index.html
@@ -366,9 +366,9 @@ <h1 class="title">G2P Encryption: Keymanager</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:c5b90c4b58fa786333889d2061bb9fe6d3eb8eb89ba9384b3c37d72d094f71ad
+!! source digest: sha256:655d43e4a6c6164c46570eac57b66a8a87aff88e6d6c16fc2b2a8447f48b0a0a
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_keymanager"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_keymanager"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
 <p>OpenG2P Encryption With Keymanager</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_keymanager%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_keymanager%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -413,7 +413,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_keymanager">OpenG2P/openg2p-security</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_keymanager">OpenG2P/openg2p-security</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_encryption_keymanager/views/encryption_provider.xml b/g2p_encryption_keymanager/views/encryption_provider.xml
index 78ca811..dbf3a70 100644
--- a/g2p_encryption_keymanager/views/encryption_provider.xml
+++ b/g2p_encryption_keymanager/views/encryption_provider.xml
@@ -13,29 +13,23 @@ Part of OpenG2P. See LICENSE file for full copyright and licensing details.
                 <group
                     name="Keymanager Settings"
                     string="Keymanager Settings"
-                    attrs="{'invisible':[('type','!=','keymanager')]}"
+                    invisible="type != 'keymanager'"
                 >
-                    <field name="keymanager_api_base_url" attrs="{'required':[('type','=','keymanager')]}" />
+                    <field name="keymanager_api_base_url" required="type == 'keymanager'" />
                     <field name="keymanager_api_timeout" />
-                    <field name="keymanager_auth_url" attrs="{'required':[('type','=','keymanager')]}" />
-                    <field
-                        name="keymanager_auth_client_id"
-                        attrs="{'required':[('type','=','keymanager')]}"
-                    />
+                    <field name="keymanager_auth_url" required="type == 'keymanager'" />
+                    <field name="keymanager_auth_client_id" required="type == 'keymanager'" />
                     <field
                         name="keymanager_auth_client_secret"
-                        attrs="{'required':[('type','=','keymanager')]}"
+                        required="type == 'keymanager'"
                         password="True"
                     />
-                    <field
-                        name="keymanager_auth_grant_type"
-                        attrs="{'required':[('type','=','keymanager')]}"
-                    />
+                    <field name="keymanager_auth_grant_type" required="type == 'keymanager'" />
                 </group>
                 <group
                     name="Keymanager Additional Settings"
                     string="Keymanager Additional Settings"
-                    attrs="{'invisible':[('type','!=','keymanager')]}"
+                    invisible="type != 'keymanager'"
                 >
                     <!-- <field name="keymanager_access_token" />
                     <field name="keymanager_access_token_expiry" /> -->
diff --git a/g2p_encryption_rest_api/README.rst b/g2p_encryption_rest_api/README.rst
index 0dbd317..8cfb069 100644
--- a/g2p_encryption_rest_api/README.rst
+++ b/g2p_encryption_rest_api/README.rst
@@ -7,14 +7,14 @@ G2P Encryption: Rest API
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:d8522c6170034591714d793b36d8c0dad1566ec87717a554421d5acb02facd3b
+   !! source digest: sha256:be5f083f8aee4de7182a1fe1b92eb22cfe63c64bb291ca5ee41860631d1de987
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_rest_api
+    :target: https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_rest_api
     :alt: OpenG2P/openg2p-security
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_rest_api%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_rest_api%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -58,6 +58,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_rest_api>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_rest_api>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_encryption_rest_api/__init__.py b/g2p_encryption_rest_api/__init__.py
index d6d6244..9ef8144 100644
--- a/g2p_encryption_rest_api/__init__.py
+++ b/g2p_encryption_rest_api/__init__.py
@@ -1,2 +1,2 @@
-from . import controllers
-from . import services
+from . import models
+from . import routers
diff --git a/g2p_encryption_rest_api/__manifest__.py b/g2p_encryption_rest_api/__manifest__.py
index 7d588de..1130118 100644
--- a/g2p_encryption_rest_api/__manifest__.py
+++ b/g2p_encryption_rest_api/__manifest__.py
@@ -1,14 +1,14 @@
 {
     "name": "G2P Encryption: Rest API",
     "category": "G2P",
-    "version": "15.0.1.2.0",
+    "version": "17.0.1.2.0",
     "sequence": 1,
     "author": "OpenG2P",
     "website": "https://openg2p.org",
     "license": "Other OSI approved licence",
     "development_status": "Alpha",
-    "depends": ["g2p_encryption", "base_rest"],
-    "data": [],
+    "depends": ["g2p_encryption", "fastapi"],
+    "data": ["data/fastapi_endpoint_security.xml"],
     "assets": {
         "web.assets_backend": [],
         "web.assets_qweb": [],
diff --git a/g2p_encryption_rest_api/controllers/__init__.py b/g2p_encryption_rest_api/controllers/__init__.py
deleted file mode 100644
index 12a7e52..0000000
--- a/g2p_encryption_rest_api/controllers/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-from . import main
diff --git a/g2p_encryption_rest_api/controllers/main.py b/g2p_encryption_rest_api/controllers/main.py
deleted file mode 100644
index aa8710b..0000000
--- a/g2p_encryption_rest_api/controllers/main.py
+++ /dev/null
@@ -1,7 +0,0 @@
-from odoo.addons.base_rest.controllers.main import RestController
-
-
-class SecurityController(RestController):
-    _root_path = "/api/v1/security/"
-    _collection_name = "base.rest.security.services"
-    _default_auth = "user"
diff --git a/g2p_encryption_rest_api/data/fastapi_endpoint_security.xml b/g2p_encryption_rest_api/data/fastapi_endpoint_security.xml
new file mode 100644
index 0000000..982bba1
--- /dev/null
+++ b/g2p_encryption_rest_api/data/fastapi_endpoint_security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <record model="fastapi.endpoint" id="fastapi_endpoint_security">
+        <field name="name">OpenG2P Secuirty FastAPI Endpoint</field>
+        <field name="description">FastAPI APIs related OpenG2P encryption and cryptography</field>
+        <field name="app">security</field>
+        <field name="root_path">/api/v1/security</field>
+    </record>
+
+    <function
+        model="fastapi.endpoint"
+        name="sync_endpoint_id_with_registry"
+        eval="(ref('g2p_encryption_rest_api.fastapi_endpoint_security'),)"
+    />
+</odoo>
diff --git a/g2p_encryption_rest_api/i18n/g2p_encryption_rest_api.pot b/g2p_encryption_rest_api/i18n/g2p_encryption_rest_api.pot
deleted file mode 100644
index a11baf5..0000000
--- a/g2p_encryption_rest_api/i18n/g2p_encryption_rest_api.pot
+++ /dev/null
@@ -1,13 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
diff --git a/g2p_encryption_rest_api/models/__init__.py b/g2p_encryption_rest_api/models/__init__.py
new file mode 100644
index 0000000..acfa3c7
--- /dev/null
+++ b/g2p_encryption_rest_api/models/__init__.py
@@ -0,0 +1 @@
+from . import fastapi_endpoint_security
diff --git a/g2p_encryption_rest_api/models/fastapi_endpoint_security.py b/g2p_encryption_rest_api/models/fastapi_endpoint_security.py
new file mode 100644
index 0000000..a426218
--- /dev/null
+++ b/g2p_encryption_rest_api/models/fastapi_endpoint_security.py
@@ -0,0 +1,23 @@
+from fastapi import APIRouter
+
+from odoo import api, fields, models
+
+from ..routers.well_known import well_known_router
+
+
+class SecurityFastApiEndpoint(models.Model):
+    _inherit = "fastapi.endpoint"
+
+    app: str = fields.Selection(
+        selection_add=[("security", "Security Endpoint")], ondelete={"security": "cascade"}
+    )
+
+    def _get_fastapi_routers(self) -> list[APIRouter]:
+        routers = super()._get_fastapi_routers()
+        if self.app == "security":
+            routers.append(well_known_router)
+        return routers
+
+    @api.model
+    def sync_endpoint_id_with_registry(self, endpoint_id):
+        return self.browse(endpoint_id).action_sync_registry()
diff --git a/g2p_encryption_rest_api/pyproject.toml b/g2p_encryption_rest_api/pyproject.toml
new file mode 100644
index 0000000..4231d0c
--- /dev/null
+++ b/g2p_encryption_rest_api/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/g2p_encryption_rest_api/services/__init__.py b/g2p_encryption_rest_api/routers/__init__.py
similarity index 100%
rename from g2p_encryption_rest_api/services/__init__.py
rename to g2p_encryption_rest_api/routers/__init__.py
diff --git a/g2p_encryption_rest_api/routers/well_known.py b/g2p_encryption_rest_api/routers/well_known.py
new file mode 100644
index 0000000..9442a9a
--- /dev/null
+++ b/g2p_encryption_rest_api/routers/well_known.py
@@ -0,0 +1,27 @@
+import logging
+from typing import Annotated
+
+from fastapi import APIRouter, Depends
+
+from odoo.api import Environment
+
+from odoo.addons.fastapi.dependencies import odoo_env
+
+_logger = logging.getLogger(__name__)
+
+well_known_router = APIRouter(prefix="/.well-known", tags=["well-known"])
+
+
+@well_known_router.get("/jwks.json")
+def get_jwks(
+    env: Annotated[Environment, Depends(odoo_env)],
+):
+    encryption_providers = env["g2p.encryption.provider"].sudo().search([])
+    jwks = []
+    for prov in encryption_providers:
+        try:
+            prov_jwks = prov.get_jwks()
+            jwks.extend(prov_jwks.get("keys", []) if prov_jwks else [])
+        except Exception:
+            _logger.exception("Unable to get JWKS from list of encryption providers")
+    return {"keys": jwks}
diff --git a/g2p_encryption_rest_api/services/well_known.py b/g2p_encryption_rest_api/services/well_known.py
deleted file mode 100644
index d620854..0000000
--- a/g2p_encryption_rest_api/services/well_known.py
+++ /dev/null
@@ -1,38 +0,0 @@
-import logging
-
-from odoo.addons.base_rest import restapi
-from odoo.addons.component.core import Component
-
-_logger = logging.getLogger(__name__)
-
-
-class WellknownRestService(Component):
-    _name = "security_well_known.rest.service"
-    _inherit = ["base.rest.service"]
-    _usage = ".well-known"
-    _collection = "base.rest.security.services"
-    _description = """
-        Security Well-Known API Services
-    """
-
-    @restapi.method(
-        [
-            (
-                [
-                    "/jwks.json",
-                ],
-                "GET",
-            )
-        ],
-        auth="public",
-    )
-    def get_jwks(self):
-        encryption_providers = self.env["g2p.encryption.provider"].sudo().search([])
-        jwks = []
-        for prov in encryption_providers:
-            try:
-                prov_jwks = prov.get_jwks()
-                jwks.extend(prov_jwks.get("keys", []) if prov_jwks else [])
-            except Exception:
-                _logger.exception("Unable to get JWKS from list of encryption providers")
-        return {"keys": jwks}
diff --git a/g2p_encryption_rest_api/static/description/index.html b/g2p_encryption_rest_api/static/description/index.html
index dd43918..c8d43ed 100644
--- a/g2p_encryption_rest_api/static/description/index.html
+++ b/g2p_encryption_rest_api/static/description/index.html
@@ -366,9 +366,9 @@ <h1 class="title">G2P Encryption: Rest API</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:d8522c6170034591714d793b36d8c0dad1566ec87717a554421d5acb02facd3b
+!! source digest: sha256:be5f083f8aee4de7182a1fe1b92eb22cfe63c64bb291ca5ee41860631d1de987
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_rest_api"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_rest_api"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
 <p>OpenG2P Encryption REST API</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_rest_api%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_rest_api%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -413,7 +413,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_rest_api">OpenG2P/openg2p-security</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_encryption_rest_api">OpenG2P/openg2p-security</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_registry_encryption/README.rst b/g2p_registry_encryption/README.rst
index 0542c98..4721cf1 100644
--- a/g2p_registry_encryption/README.rst
+++ b/g2p_registry_encryption/README.rst
@@ -7,14 +7,14 @@ G2P Registry: Encryption
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:7c716f60dee515e3e3aca70ba7e24c0c97e8669335b6f07c856ed87af7b9da01
+   !! source digest: sha256:5d574621e8d74b012319a50154c5d4bc9d87b545246bbea9c84cd9081da97a57
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png
     :target: https://odoo-community.org/page/development-status
     :alt: Alpha
 .. |badge2| image:: https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github
-    :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_registry_encryption
+    :target: https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_registry_encryption
     :alt: OpenG2P/openg2p-security
 
 |badge1| |badge2|
@@ -37,7 +37,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_registry_encryption%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_registry_encryption%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -58,6 +58,6 @@ Contributors
 Maintainers
 ~~~~~~~~~~~
 
-This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_registry_encryption>`_ project on GitHub.
+This module is part of the `OpenG2P/openg2p-security <https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_registry_encryption>`_ project on GitHub.
 
 You are welcome to contribute.
diff --git a/g2p_registry_encryption/__manifest__.py b/g2p_registry_encryption/__manifest__.py
index 5e65068..2212eb6 100644
--- a/g2p_registry_encryption/__manifest__.py
+++ b/g2p_registry_encryption/__manifest__.py
@@ -1,7 +1,7 @@
 {
     "name": "G2P Registry: Encryption",
     "category": "G2P",
-    "version": "15.0.1.2.0",
+    "version": "17.0.1.2.0",
     "sequence": 1,
     "author": "OpenG2P",
     "website": "https://openg2p.org",
diff --git a/g2p_registry_encryption/i18n/g2p_registry_encryption.pot b/g2p_registry_encryption/i18n/g2p_registry_encryption.pot
deleted file mode 100644
index 7db2608..0000000
--- a/g2p_registry_encryption/i18n/g2p_registry_encryption.pot
+++ /dev/null
@@ -1,105 +0,0 @@
-# Translation of Odoo Server.
-# This file contains the translation of the following modules:
-# 	* g2p_registry_encryption
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Odoo Server 15.0\n"
-"Report-Msgid-Bugs-To: \n"
-"Last-Translator: \n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid ""
-"<span class=\"text-muted\">By choosing this, you are consenting to "
-"decrypting fields on registry. So be careful</span>"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid ""
-"<span class=\"text-muted\">This option enables registry fields "
-"encryption</span>"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model,name:g2p_registry_encryption.model_res_config_settings
-msgid "Config Settings"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model,name:g2p_registry_encryption.model_res_partner
-msgid "Contact"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_config_settings__decrypt_registry
-msgid "Decrypt Registry"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Decrypt Registry Config"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Decrypt Registry fields"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_config_settings__encrypt_registry
-msgid "Encrypt Registry"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Encrypt Registry Config"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Encrypt Registry fields"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_partner__encrypted_val
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_users__encrypted_val
-msgid "Encrypted value"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Encryption Provider for Registry"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model,name:g2p_registry_encryption.model_g2p_encryption_provider
-msgid "G2P Encryption Provider"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "G2P Registry Encryption Settings"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_partner__is_encrypted
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_users__is_encrypted
-msgid "Is Encrypted"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model:ir.model.fields,field_description:g2p_registry_encryption.field_res_config_settings__registry_encryption_provider
-msgid "Registry Encryption Provider"
-msgstr ""
-
-#. module: g2p_registry_encryption
-#: model_terms:ir.ui.view,arch_db:g2p_registry_encryption.openg2p_inherit_res_config_settings_view_form
-msgid "Registry Encryption Provider Config"
-msgstr ""
diff --git a/g2p_registry_encryption/models/partner.py b/g2p_registry_encryption/models/partner.py
index dcf72c7..f2555a3 100644
--- a/g2p_registry_encryption/models/partner.py
+++ b/g2p_registry_encryption/models/partner.py
@@ -68,9 +68,9 @@ def write(self, vals):
 
         return super().write(vals)
 
-    def _read(self, fields):
+    def _fetch_query(self, query, fields):
         fields = set(fields)
-        res = super()._read(fields)
+        res = super()._fetch_query(query, fields)
         prov = self.env["g2p.encryption.provider"].get_registry_provider()
         enc_fields_set = prov.get_registry_fields_set_to_enc().intersection(fields)
         if not enc_fields_set:
diff --git a/g2p_registry_encryption/pyproject.toml b/g2p_registry_encryption/pyproject.toml
new file mode 100644
index 0000000..4231d0c
--- /dev/null
+++ b/g2p_registry_encryption/pyproject.toml
@@ -0,0 +1,3 @@
+[build-system]
+requires = ["whool"]
+build-backend = "whool.buildapi"
diff --git a/g2p_registry_encryption/static/description/index.html b/g2p_registry_encryption/static/description/index.html
index 3bc7112..67ea726 100644
--- a/g2p_registry_encryption/static/description/index.html
+++ b/g2p_registry_encryption/static/description/index.html
@@ -366,9 +366,9 @@ <h1 class="title">G2P Registry: Encryption</h1>
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:7c716f60dee515e3e3aca70ba7e24c0c97e8669335b6f07c856ed87af7b9da01
+!! source digest: sha256:5d574621e8d74b012319a50154c5d4bc9d87b545246bbea9c84cd9081da97a57
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_registry_encryption"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Alpha" src="https://img.shields.io/badge/maturity-Alpha-red.png" /></a> <a class="reference external image-reference" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_registry_encryption"><img alt="OpenG2P/openg2p-security" src="https://img.shields.io/badge/github-OpenG2P%2Fopeng2p--security-lightgray.png?logo=github" /></a></p>
 <p>OpenG2P Registry Encryption</p>
 <div class="admonition important">
 <p class="first admonition-title">Important</p>
@@ -393,7 +393,7 @@ <h1><a class="toc-backref" href="#toc-entry-1">Bug Tracker</a></h1>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_registry_encryption%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_registry_encryption%0Aversion:%2017.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -413,7 +413,7 @@ <h2><a class="toc-backref" href="#toc-entry-4">Contributors</a></h2>
 </div>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-5">Maintainers</a></h2>
-<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_registry_encryption">OpenG2P/openg2p-security</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OpenG2P/openg2p-security/tree/17.0-develop/g2p_registry_encryption">OpenG2P/openg2p-security</a> project on GitHub.</p>
 <p>You are welcome to contribute.</p>
 </div>
 </div>
diff --git a/g2p_registry_encryption/views/res_config_view.xml b/g2p_registry_encryption/views/res_config_view.xml
index 9fce9c9..5a007e2 100644
--- a/g2p_registry_encryption/views/res_config_view.xml
+++ b/g2p_registry_encryption/views/res_config_view.xml
@@ -6,48 +6,28 @@
         <field name="priority" eval="1010" />
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='g2p_config_settings']" position="inside">
-                <h2>G2P Registry Encryption Settings</h2>
-                <div class="row mt16 o_settings_container" name="encryption_settings_container">
-                    <div
-                        class="col-12 col-lg-6 o_setting_box"
-                        id="registry_encryption_provider_config"
-                        title="Registry Encryption Provider Config"
+            <app name="g2p_config_settings" position="inside">
+                <block name="encryption_settings_container" title="G2P Registry Encryption Settings">
+                    <setting
+                        string="Registry Encryption Provider Config"
+                        help="Select the encryption provider to encrypt the registry"
                     >
-                        <div class="o_setting_right_pane">
-                            <label
-                                for="registry_encryption_provider"
-                                string="Encryption Provider for Registry"
-                            />
-                            <field name="registry_encryption_provider" />
-                        </div>
-                    </div>
-                    <div
-                        class="col-12 col-lg-6 o_setting_box"
-                        id="encrypt_registry_config"
-                        title="Encrypt Registry Config"
+                        <field name="registry_encryption_provider" />
+                    </setting>
+                    <setting
+                        string="Encrypt Registry Config"
+                        help="This option enables registry fields encrpytion"
                     >
-                        <div class="o_setting_right_pane">
-                            <field name="encrypt_registry" />
-                            <label for="encrypt_registry" string="Encrypt Registry fields" />
-                            <span class="text-muted">This option enables registry fields encryption</span>
-                        </div>
-                    </div>
-                    <div
-                        class="col-12 col-lg-6 o_setting_box"
-                        id="decrypt_registry_config"
-                        title="Decrypt Registry Config"
+                        <field name="encrypt_registry" />
+                    </setting>
+                    <setting
+                        string="Decrypt Registry Config"
+                        help="By choosing this, you are consenting to decrypting fields on registry. So be careful"
                     >
-                        <div class="o_setting_right_pane">
-                            <field name="decrypt_registry" />
-                            <label for="decrypt_registry" string="Decrypt Registry fields" />
-                            <span
-                                class="text-muted"
-                            >By choosing this, you are consenting to decrypting fields on registry. So be careful</span>
-                        </div>
-                    </div>
-                </div>
-            </xpath>
+                        <field name="decrypt_registry" />
+                    </setting>
+                </block>
+            </app>
         </field>
     </record>
 </odoo>
diff --git a/requirements.txt b/requirements.txt
index 25566c7..2242a65 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
 # generated from manifests external_dependencies
-cryptography <37
+cryptography<37
 jwcrypto
 python-jose
diff --git a/setup/.setuptools-odoo-make-default-ignore b/setup/.setuptools-odoo-make-default-ignore
deleted file mode 100644
index 207e615..0000000
--- a/setup/.setuptools-odoo-make-default-ignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# addons listed in this file are ignored by
-# setuptools-odoo-make-default (one addon per line)
diff --git a/setup/README b/setup/README
deleted file mode 100644
index a63d633..0000000
--- a/setup/README
+++ /dev/null
@@ -1,2 +0,0 @@
-To learn more about this directory, please visit
-https://pypi.python.org/pypi/setuptools-odoo
diff --git a/setup/g2p_encryption/odoo/addons/g2p_encryption b/setup/g2p_encryption/odoo/addons/g2p_encryption
deleted file mode 120000
index c0667a9..0000000
--- a/setup/g2p_encryption/odoo/addons/g2p_encryption
+++ /dev/null
@@ -1 +0,0 @@
-../../../../g2p_encryption
\ No newline at end of file
diff --git a/setup/g2p_encryption/setup.py b/setup/g2p_encryption/setup.py
deleted file mode 100644
index 28c57bb..0000000
--- a/setup/g2p_encryption/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import setuptools
-
-setuptools.setup(
-    setup_requires=['setuptools-odoo'],
-    odoo_addon=True,
-)
diff --git a/setup/g2p_encryption_keymanager/odoo/addons/g2p_encryption_keymanager b/setup/g2p_encryption_keymanager/odoo/addons/g2p_encryption_keymanager
deleted file mode 120000
index dc54ebc..0000000
--- a/setup/g2p_encryption_keymanager/odoo/addons/g2p_encryption_keymanager
+++ /dev/null
@@ -1 +0,0 @@
-../../../../g2p_encryption_keymanager
\ No newline at end of file
diff --git a/setup/g2p_encryption_keymanager/setup.py b/setup/g2p_encryption_keymanager/setup.py
deleted file mode 100644
index 28c57bb..0000000
--- a/setup/g2p_encryption_keymanager/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import setuptools
-
-setuptools.setup(
-    setup_requires=['setuptools-odoo'],
-    odoo_addon=True,
-)
diff --git a/setup/g2p_encryption_rest_api/odoo/addons/g2p_encryption_rest_api b/setup/g2p_encryption_rest_api/odoo/addons/g2p_encryption_rest_api
deleted file mode 120000
index 517f73a..0000000
--- a/setup/g2p_encryption_rest_api/odoo/addons/g2p_encryption_rest_api
+++ /dev/null
@@ -1 +0,0 @@
-../../../../g2p_encryption_rest_api
\ No newline at end of file
diff --git a/setup/g2p_encryption_rest_api/setup.py b/setup/g2p_encryption_rest_api/setup.py
deleted file mode 100644
index 28c57bb..0000000
--- a/setup/g2p_encryption_rest_api/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import setuptools
-
-setuptools.setup(
-    setup_requires=['setuptools-odoo'],
-    odoo_addon=True,
-)
diff --git a/setup/g2p_registry_encryption/odoo/addons/g2p_registry_encryption b/setup/g2p_registry_encryption/odoo/addons/g2p_registry_encryption
deleted file mode 120000
index fe359ac..0000000
--- a/setup/g2p_registry_encryption/odoo/addons/g2p_registry_encryption
+++ /dev/null
@@ -1 +0,0 @@
-../../../../g2p_registry_encryption
\ No newline at end of file
diff --git a/setup/g2p_registry_encryption/setup.py b/setup/g2p_registry_encryption/setup.py
deleted file mode 100644
index 28c57bb..0000000
--- a/setup/g2p_registry_encryption/setup.py
+++ /dev/null
@@ -1,6 +0,0 @@
-import setuptools
-
-setuptools.setup(
-    setup_requires=['setuptools-odoo'],
-    odoo_addon=True,
-)
diff --git a/test-requirements.txt b/test-requirements.txt
index 3e4e76f..37d8df5 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,2 +1,2 @@
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_base
-git+https://github.com/OpenG2P/openg2p-registry@15.0-develop#subdirectory=setup/g2p_registry_individual
+git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_base
+git+https://github.com/OpenG2P/openg2p-registry@17.0-develop#subdirectory=setup/g2p_registry_individual