diff --git a/README.md b/README.md
index 460d238..8fa0ca0 100644
--- a/README.md
+++ b/README.md
@@ -1,12 +1,12 @@
 # HOPS - Homelab Orchestration Provisioning Script
 
 [![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Version](https://img.shields.io/badge/Version-3.1.0-blue.svg)]()
+[![Version](https://img.shields.io/badge/Version-3.1.0--beta-blue.svg)]()
 [![Platform](https://img.shields.io/badge/Platform-Linux%20%7C%20macOS%20%7C%20Windows-orange.svg)]()
 
 **HOPS** is a comprehensive, automated deployment solution for popular homelab applications. It simplifies the process of setting up and managing Docker-based services including media servers, download clients, monitoring tools, and more.
 
-## 🆕 What's New in v3.1.0
+## 🆕 What's New in v3.1.0-beta
 
 ### Major Security Enhancements
 - **🔐 Encrypted Secret Management**: All passwords and sensitive data now encrypted with AES-256
@@ -327,7 +327,7 @@ docker compose down                     # Stop all services
 ```
 
 ### New Architecture
-HOPS v3.1.0 introduces a modular architecture with shared libraries:
+HOPS v3.1.0-beta introduces a modular architecture with shared libraries:
 
 ```
 hops/
diff --git a/hops b/hops
index f72ffd4..102c840 100755
--- a/hops
+++ b/hops
@@ -8,7 +8,7 @@
 set -e
 
 # Script version and metadata
-readonly SCRIPT_VERSION="3.1.0"
+readonly SCRIPT_VERSION="3.1.0-beta"
 readonly SCRIPT_NAME="HOPS"
 readonly SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
diff --git a/install b/install
index fddaeed..acdd2d9 100755
--- a/install
+++ b/install
@@ -8,7 +8,7 @@ install_hops() {
     set -e
 
     # Script version for update tracking
-    local SCRIPT_VERSION="3.1.0"
+    local SCRIPT_VERSION="3.1.0-beta"
     local SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 
     # Load system utilities
diff --git a/lib/common.sh b/lib/common.sh
index 5ed690a..74f52df 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Common Utility Functions
 # Shared functions for logging, error handling, and UI
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Prevent multiple sourcing
 if [[ -n "${HOPS_COMMON_LOADED:-}" ]]; then
diff --git a/lib/docker.sh b/lib/docker.sh
index 1426aeb..b096c1e 100644
--- a/lib/docker.sh
+++ b/lib/docker.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Docker Service Management
 # Functions for Docker service management and monitoring
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/lib/privileges.sh b/lib/privileges.sh
index 3ec1d4b..7a00196 100755
--- a/lib/privileges.sh
+++ b/lib/privileges.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Privilege Management System
 # Split operations into privileged and non-privileged components
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -158,7 +158,7 @@ create_privileged_setup() {
 
 # HOPS Privileged Setup Script
 # This script handles operations that require root privileges
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e
 
@@ -406,7 +406,7 @@ create_user_script() {
 
 # HOPS User Script
 # This script handles operations that can run as regular user
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e
 
@@ -591,7 +591,7 @@ create_installation_wrapper() {
 
 # HOPS Installation Wrapper
 # Orchestrates privileged and non-privileged installation steps
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e
 
diff --git a/lib/secrets.sh b/lib/secrets.sh
index 0774061..b1d8d6c 100755
--- a/lib/secrets.sh
+++ b/lib/secrets.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Secret Management System
 # Secure encryption and management of sensitive configuration data
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
@@ -190,7 +190,7 @@ create_encrypted_environment() {
     cat > "$temp_env_file" << EOF
 # HOPS Environment Configuration
 # Generated on: $(date)
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Core Configuration
 PUID=$puid
diff --git a/lib/security.sh b/lib/security.sh
index 2bcab67..4ef5f98 100644
--- a/lib/security.sh
+++ b/lib/security.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Security Functions
 # Password generation, validation, and security utilities
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/lib/system.sh b/lib/system.sh
index 6e92602..5590e07 100644
--- a/lib/system.sh
+++ b/lib/system.sh
@@ -2,7 +2,7 @@
 
 # HOPS - System Validation Functions
 # Functions for system checks, OS detection, and requirements validation
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 LIB_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/lib/validation.sh b/lib/validation.sh
index 2b7ba37..5bd1490 100644
--- a/lib/validation.sh
+++ b/lib/validation.sh
@@ -2,7 +2,7 @@
 
 # HOPS - Input Validation and Sanitization Functions
 # Comprehensive input validation and sanitization utilities
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Source common functions
 SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
diff --git a/privileged-setup b/privileged-setup
index d9afa7c..f96f3ff 100755
--- a/privileged-setup
+++ b/privileged-setup
@@ -2,7 +2,7 @@
 
 # HOPS Privileged Setup Script
 # This script handles operations that require root privileges
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e
 
diff --git a/services b/services
index 8ca9207..7aea12e 100755
--- a/services
+++ b/services
@@ -2,7 +2,7 @@
 
 # HOPS Service Definitions
 # Contains all Docker Compose service configurations
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # This script provides functions to generate Docker Compose service definitions
 # Usage: Source this script and call generate_service_definition <service_name>
diff --git a/services-improved b/services-improved
index 22328d0..f3db1c0 100755
--- a/services-improved
+++ b/services-improved
@@ -2,7 +2,7 @@
 
 # HOPS Service Definitions - Improved Version
 # Contains all Docker Compose service configurations with error handling and pinned versions
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 # Exit on any error
 set -e
diff --git a/setup b/setup
index 8a1d7e9..90fc9dc 100755
--- a/setup
+++ b/setup
@@ -2,7 +2,7 @@
 
 # HOPS Installation Wrapper
 # Orchestrates privileged and non-privileged installation steps
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e
 
@@ -13,7 +13,7 @@ source "$SCRIPT_DIR/lib/common.sh"
 setup_logging "installation-wrapper"
 
 # Show header
-show_hops_header "3.1.0" "Installation Wrapper"
+show_hops_header "3.1.0-beta" "Installation Wrapper"
 
 # Check if we're running as root
 if [[ $EUID -eq 0 ]]; then
diff --git a/uninstall b/uninstall
index b960678..ec28f0b 100755
--- a/uninstall
+++ b/uninstall
@@ -8,7 +8,7 @@ uninstall_hops() {
     set +e
 
     # Script version for consistency
-    local SCRIPT_VERSION="3.1.0"
+    local SCRIPT_VERSION="3.1.0-beta"
 
     # --------------------------------------------
     # LOGGING SETUP
diff --git a/user-operations b/user-operations
index ffd5fad..4382930 100755
--- a/user-operations
+++ b/user-operations
@@ -2,7 +2,7 @@
 
 # HOPS User Script
 # This script handles operations that can run as regular user
-# Version: 3.1.0
+# Version: 3.1.0-beta
 
 set -e