diff --git a/share/functions/fish_fallback_prompt.fish b/share/functions/fish_fallback_prompt.fish
index 5c8d1584e..ae4fa0210 100644
--- a/share/functions/fish_fallback_prompt.fish
+++ b/share/functions/fish_fallback_prompt.fish
@@ -5,7 +5,7 @@
 function fish_fallback_prompt --description "A simple fallback prompt without too much color or special characters for linux VTs"
 	# Just calculate this once, to save a few cycles when displaying the prompt
 	if not set -q __fish_prompt_hostname
-		set -g __fish_prompt_hostname (uname -n)
+		set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
 	end
 
 	set -l color_cwd
diff --git a/share/functions/fish_prompt.fish b/share/functions/fish_prompt.fish
index fcccad3fc..b4a350b8f 100644
--- a/share/functions/fish_prompt.fish
+++ b/share/functions/fish_prompt.fish
@@ -5,7 +5,7 @@
 function fish_prompt --description "Write out the prompt"
 	# Just calculate this once, to save a few cycles when displaying the prompt
 	if not set -q __fish_prompt_hostname
-		set -g __fish_prompt_hostname (uname -n)
+		set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
 	end
 
 	set -l color_cwd
diff --git a/share/tools/web_config/sample_prompts/classic.fish b/share/tools/web_config/sample_prompts/classic.fish
index e421f944a..b092803e4 100644
--- a/share/tools/web_config/sample_prompts/classic.fish
+++ b/share/tools/web_config/sample_prompts/classic.fish
@@ -2,7 +2,7 @@
 function fish_prompt --description "Write out the prompt"
 	# Just calculate this once, to save a few cycles when displaying the prompt
 	if not set -q __fish_prompt_hostname
-		set -g __fish_prompt_hostname (uname -n)
+		set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
 	end
 
 	set -l color_cwd
diff --git a/share/tools/web_config/sample_prompts/classic_git.fish b/share/tools/web_config/sample_prompts/classic_git.fish
index 7d0f15d78..888f95cb0 100644
--- a/share/tools/web_config/sample_prompts/classic_git.fish
+++ b/share/tools/web_config/sample_prompts/classic_git.fish
@@ -7,7 +7,7 @@ function fish_prompt --description 'Write out the prompt'
 
 	# Just calculate this once, to save a few cycles when displaying the prompt
 	if not set -q __fish_prompt_hostname
-		set -g __fish_prompt_hostname (uname -n)
+		set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
 	end
 
 	set -l normal (set_color normal)
diff --git a/share/tools/web_config/sample_prompts/classic_status.fish b/share/tools/web_config/sample_prompts/classic_status.fish
index 6779c63fb..fe64f7934 100644
--- a/share/tools/web_config/sample_prompts/classic_status.fish
+++ b/share/tools/web_config/sample_prompts/classic_status.fish
@@ -12,7 +12,7 @@ function fish_prompt --description "Write out the prompt"
 
     # Just calculate this once, to save a few cycles when displaying the prompt
     if not set -q __fish_prompt_hostname
-        set -g __fish_prompt_hostname (uname -n)
+        set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
     end
 
     set -l color_cwd
diff --git a/share/tools/web_config/sample_prompts/debian_chroot.fish b/share/tools/web_config/sample_prompts/debian_chroot.fish
index 694c5c5d1..80acfa9a5 100644
--- a/share/tools/web_config/sample_prompts/debian_chroot.fish
+++ b/share/tools/web_config/sample_prompts/debian_chroot.fish
@@ -5,7 +5,7 @@ function fish_prompt --description 'Write out the prompt, prepending the Debian
 
         # Just calculate these once, to save a few cycles when displaying the prompt
         if not set -q __fish_prompt_hostname
-                set -g __fish_prompt_hostname (uname -n)
+                set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
         end
 
         if not set -q __fish_prompt_normal
diff --git a/share/tools/web_config/sample_prompts/informative.fish b/share/tools/web_config/sample_prompts/informative.fish
index 7600cf977..749d81713 100644
--- a/share/tools/web_config/sample_prompts/informative.fish
+++ b/share/tools/web_config/sample_prompts/informative.fish
@@ -8,7 +8,7 @@ function fish_prompt --description 'Write out the prompt'
 
 # Just calculate these once, to save a few cycles when displaying the prompt
     if not set -q __fish_prompt_hostname
-        set -g __fish_prompt_hostname (uname -n)
+        set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
     end
 
 if not set -q __fish_prompt_normal
diff --git a/share/tools/web_config/sample_prompts/lonetwin.fish b/share/tools/web_config/sample_prompts/lonetwin.fish
index cd56e43b2..674785941 100644
--- a/share/tools/web_config/sample_prompts/lonetwin.fish
+++ b/share/tools/web_config/sample_prompts/lonetwin.fish
@@ -4,7 +4,7 @@
 function fish_prompt --description 'Write out the prompt'
    # Just calculate these once, to save a few cycles when displaying the prompt
    if not set -q __fish_prompt_hostname
-       set -g __fish_prompt_hostname (uname -n)
+       set -g __fish_prompt_hostname (hostname -s)
    end
 
    if not set -q __fish_prompt_normal
diff --git a/share/tools/web_config/sample_prompts/pythonista.fish b/share/tools/web_config/sample_prompts/pythonista.fish
index b36e8ba4c..ad772e2f7 100644
--- a/share/tools/web_config/sample_prompts/pythonista.fish
+++ b/share/tools/web_config/sample_prompts/pythonista.fish
@@ -12,7 +12,7 @@ function fish_prompt
    printf ' at '
 
    set_color magenta
-   printf '%s' (uname -n)
+   printf '%s' (hostname|cut -d . -f 1)
    set_color normal
    printf ' in '
 
diff --git a/share/tools/web_config/sample_prompts/screen_savvy.fish b/share/tools/web_config/sample_prompts/screen_savvy.fish
index 8590ce2ca..83c7db641 100644
--- a/share/tools/web_config/sample_prompts/screen_savvy.fish
+++ b/share/tools/web_config/sample_prompts/screen_savvy.fish
@@ -2,8 +2,8 @@
 # author: Matthias
 function fish_prompt -d "Write out the prompt"
  if test -z $WINDOW
-   printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (uname -n) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+   printf '%s%s@%s%s%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
  else
-   printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (uname -n) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
+   printf '%s%s@%s%s%s(%s)%s%s%s> ' (set_color yellow) (whoami) (set_color purple) (hostname|cut -d . -f 1) (set_color white) (echo $WINDOW) (set_color $fish_color_cwd) (prompt_pwd) (set_color normal)
  end
 end
diff --git a/share/tools/web_config/sample_prompts/terlar.fish b/share/tools/web_config/sample_prompts/terlar.fish
index 85f4c61c1..d75b17b58 100644
--- a/share/tools/web_config/sample_prompts/terlar.fish
+++ b/share/tools/web_config/sample_prompts/terlar.fish
@@ -13,7 +13,7 @@ function fish_prompt --description 'Write out the prompt'
 
   # Host
   set_color $fish_color_host
-  echo -n (uname -n)
+  echo -n (hostname -s)
   set_color normal
 
   echo -n ':'
diff --git a/share/tools/web_config/sample_prompts/user_host_path.fish b/share/tools/web_config/sample_prompts/user_host_path.fish
index dbc321a0c..de917ee71 100644
--- a/share/tools/web_config/sample_prompts/user_host_path.fish
+++ b/share/tools/web_config/sample_prompts/user_host_path.fish
@@ -9,5 +9,5 @@ function fish_prompt -d "Write out the prompt"
        case root toor; set prompt_symbol '#'
        case '*';  set prompt_symbol '$'
    end
-   printf "[%s@%s %s%s%s]%s " $USER (uname -n) (set_color $fish_color_cwd) $pwd (set_color normal) $prompt_symbol
+   printf "[%s@%s %s%s%s]%s " $USER (hostname -s) (set_color $fish_color_cwd) $pwd (set_color normal) $prompt_symbol
 end