diff --git a/backend/__init__.py b/backend/__init__.py
index f378f71..317a25a 100644
--- a/backend/__init__.py
+++ b/backend/__init__.py
@@ -11,9 +11,11 @@ The backend is designed to be modular and can be used both as a standalone
 library and as part of the web application.
 """
 
-__version__ = "1.1.0"
+import os
+
+__version__ = os.getenv("APP_VERSION", "1.1.0")
 __author__ = "UnitForge Team"
-__email__ = "contact@unitforge.dev"
+__email__ = os.getenv("CONTACT_EMAIL", "contact@unitforge.dev")
 
 # Package metadata
 __all__ = [
diff --git a/backend/cli/__init__.py b/backend/cli/__init__.py
index 2648a4d..51de3b0 100644
--- a/backend/cli/__init__.py
+++ b/backend/cli/__init__.py
@@ -18,15 +18,16 @@ if _backend_path not in sys.path:
     sys.path.insert(0, _backend_path)
 
 # Import our modules after path setup
+from app.core.config import settings  # noqa: E402
 from app.core.templates import template_registry  # noqa: E402
 from app.core.unit_file import SystemdUnitFile, UnitType, create_unit_file  # noqa: E402
 
 
 @click.group()
-@click.version_option(version="1.0.0")
+@click.version_option(version=settings.app_version)
 def cli():
-    """
-    UnitForge - Create, validate, and manage systemd unit files.
+    f"""
+    {settings.app_name} - Create, validate, and manage systemd unit files.
 
     A comprehensive tool for working with systemd unit files from the command line.
     """