diff --git a/software/setup.cfg b/software/setup.cfg
index 9f18743f..ab153c8b 100644
--- a/software/setup.cfg
+++ b/software/setup.cfg
@@ -1,14 +1,13 @@
 [metadata]
 name = software
-summary = A Project Gating System
-description_file =
-    README.rst
+version = attr: software.VERSION
+summary = Unified Software Management
+description = file: README.rst
 author = StarlingX Team
 author_email = starlingx-discuss@lists.starlingx.io
 home_page = https://www.starlingx.io/
-python_requires = >=3.9
 license_files = LICENSE
-classifier =
+classifiers =
     Environment :: OpenStack
     Intended Audience :: Information Technology
     Intended Audience :: System Administrators
@@ -18,15 +17,26 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.9
 
-[files]
-packages =
-    software
+[options]
+packages = find:
+python_requires = >=3.9
+install_requires =
+    pycryptodomex
 
-[entry_points]
+[options.packages.find]
+exclude =
+    software.tests*
+
+[options.package_data]
+* =
+    templates/*
+
+[options.entry_points]
 console_scripts =
     software = software.software_client:main
     software-controller-daemon = software.software_controller:main
     software-agent = software.software_agent:main
 
+
 [wheel]
 universal = 1
diff --git a/software/setup.py b/software/setup.py
index 4729f4d8..4e042b36 100644
--- a/software/setup.py
+++ b/software/setup.py
@@ -5,7 +5,5 @@
 #
 import setuptools
 
-setuptools.setup(
-    setup_requires=['pbr'],
-    pbr=True
-)
+setuptools.setup()
+
diff --git a/software/software/__init__.py b/software/software/__init__.py
index e69de29b..3bf7dae5 100644
--- a/software/software/__init__.py
+++ b/software/software/__init__.py
@@ -0,0 +1,2 @@
+# The version of this component
+VERSION = 1.0