diff --git a/CHANGELOG b/CHANGELOG
index 10f2411..e165abf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -72,6 +72,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * base: install ncdu and htop often used as diagnostic tools
 * base: dump-server-state.sh upstream release 23.06
 * evocheck: upstream release 23.06
+* base: add evobsd_alias_fwupdate variable and make kshrc file a template so we can set or not a fw_update alias to servers that need it
 
 ### Fixed
 
diff --git a/roles/base/defaults/main.yml b/roles/base/defaults/main.yml
index f25c26e..f13e1dc 100644
--- a/roles/base/defaults/main.yml
+++ b/roles/base/defaults/main.yml
@@ -4,6 +4,7 @@
 # dotfiles.yml
 evobsd_system_timeout: 36000
 evobsd_path: "$HOME/bin:/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"
+evobsd_alias_fwupdate: false
 
 # mail.yml
 general_alert_email: "root@localhost"
diff --git a/roles/base/tasks/dotfiles.yml b/roles/base/tasks/dotfiles.yml
index 0b59786..09c4292 100644
--- a/roles/base/tasks/dotfiles.yml
+++ b/roles/base/tasks/dotfiles.yml
@@ -18,8 +18,8 @@
     - dotfiles
 
 - name: "Customize .kshrc environment file"
-  copy:
-    src: kshrc
+  template:
+    src: kshrc.j2
     dest: /root/.kshrc
     mode: "0644"
   tags:
@@ -57,8 +57,8 @@
     - dotfiles
 
 - name: "Customize .kshrc environment file for new users"
-  copy:
-    src: kshrc
+  template:
+    src: kshrc.j2
     dest: /etc/skel/.kshrc
     mode: "0644"
   tags:
diff --git a/roles/base/files/kshrc b/roles/base/templates/kshrc.j2
similarity index 93%
rename from roles/base/files/kshrc
rename to roles/base/templates/kshrc.j2
index 68d86ec..a7e2526 100644
--- a/roles/base/files/kshrc
+++ b/roles/base/templates/kshrc.j2
@@ -1,3 +1,6 @@
+{% if evobsd_alias_fwupdate %}
+alias fw_update="{{ evobsd_alias_fwupdate }}"
+{% endif %}
 alias vi='vim'
 sudo() { if [[ $# == "1" ]] && [[ $1 == "su" ]]; then command sudo -i; else command sudo "$@"; fi }
 alias history="fc -l 0"