diff --git a/README.rst b/README.rst
index 27a0edf84..98f315165 100644
--- a/README.rst
+++ b/README.rst
@@ -43,7 +43,7 @@ FACET is composed of the following key components:
 |                | frames that ensures end-to-end traceability of features.            |
 +----------------+---------------------------------------------------------------------+
 
-|azure_pypi| |azure_conda| |azure_devops_master_ci| |code_cov|
+|pypi| |conda| |azure_devops_master_ci| |code_cov|
 |python_versions| |code_style| |made_with_sphinx_doc| |License_badge|
 
 Installation
@@ -291,11 +291,11 @@ or have a look at
 
 .. |spacer| unicode:: 0x2028 0x2003 0x2003 0x2003 0x2003 0x2003 0x2003
 
-.. |azure_conda| image:: https://
-   :target: https://
+.. |conda| image:: https://anaconda.org/bcg_gamma/gamma-facet/badges/version.svg
+    :target: https://anaconda.org/BCG_Gamma/gamma-facet
 
-.. |azure_pypi| image:: https://
-   :target: https://
+.. |pypi| image:: https://badge.fury.io/py/gamma-facet.svg
+    :target: https://pypi.org/project/gamma-facet/
 
 .. |azure_devops_master_ci| image:: https://
    :target: https://
diff --git a/pyproject.toml b/pyproject.toml
index eb072ca15..c62a34f26 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -30,6 +30,22 @@ requires = [
 
 requires-python = ">=3.6,<4"
 
+classifiers = [
+    "Development Status :: 5 - Production/Stable",
+    "Intended Audience :: Science/Research",
+    "License :: OSI Approved :: Apache Software License",
+    "Operating System :: MacOS",
+    "Operating System :: Microsoft :: Windows",
+    "Operating System :: POSIX :: Linux",
+    "Operating System :: Unix",
+    "Programming Language :: Python",
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.6",
+    "Programming Language :: Python :: 3.7",
+    "Programming Language :: Python :: 3.8",
+    "Topic :: Scientific/Engineering",
+]
+
 [tool.flit.metadata.requires-extra]
 testing = [
     "pytest >= 5.2.*",