diff --git a/apps/x86_64-linux/apply b/apps/x86_64-linux/apply
index 2924036..8661f29 100755
--- a/apps/x86_64-linux/apply
+++ b/apps/x86_64-linux/apply
@@ -24,7 +24,7 @@ print_warning() {
     echo -e "${YELLOW}⚡${NC} $1"
 }
 
-HOSTNAME="${1:-tahani}"
+HOSTNAME="${1:-$(hostname)}"
 
 print_info "Applying configuration for $HOSTNAME"
 
diff --git a/apps/x86_64-linux/build b/apps/x86_64-linux/build
index a9c47a4..29a7091 100755
--- a/apps/x86_64-linux/build
+++ b/apps/x86_64-linux/build
@@ -24,7 +24,7 @@ print_warning() {
     echo -e "${YELLOW}⚡${NC} $1"
 }
 
-HOSTNAME="${1:-tahani}"
+HOSTNAME="${1:-$(hostname)}"
 
 print_info "Building configuration for $HOSTNAME"
 
diff --git a/apps/x86_64-linux/build-switch b/apps/x86_64-linux/build-switch
index 3ca4eb1..d954277 100755
--- a/apps/x86_64-linux/build-switch
+++ b/apps/x86_64-linux/build-switch
@@ -20,7 +20,7 @@ print_error() {
     echo -e "${RED}❌${NC} $1"
 }
 
-HOSTNAME="${1:-tahani}"
+HOSTNAME="${1:-$(hostname)}"
 
 print_info "Building and switching configuration for $HOSTNAME"