diff --git a/home/programs/go.nix b/home/programs/go.nix
index 7500b0b..dba450c 100644
--- a/home/programs/go.nix
+++ b/home/programs/go.nix
@@ -1,16 +1,14 @@
-{ config, lib, unstable, pkgs, ... }:
+{ config, lib, ... }:
 let
   cfg = config.profile.go;
 in
 {
   config = lib.mkIf cfg.enable {
-    programs.zsh.initExtra = ''zsh-defer source<(cat ${pkgs.zsh-completions}/share/zsh/site-functions/_golang)'';
     programs.go = {
       enable = true;
       goPrivate = [
         "gitlab.bareksa.com"
       ];
-      package = unstable.go_1_22;
     };
   };
 }
diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix
index 3bb0a72..71891ec 100644
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@@ -11,6 +11,13 @@ in
   ];
   programs.zsh = {
     enable = true;
+    envExtra = /*bash*/ ''
+      # Disable loading global RC files in /etc/zsh/*
+      # Mostly because they are unneeded
+      # and global rc files has to be small for security reasons (no plugins)
+      # thus making them saver for Root account to load them.
+      unsetopt GLOBAL_RCS
+    '';
     autosuggestion.enable = true;
     enableCompletion = true;
     defaultKeymap = "emacs";
@@ -47,11 +54,11 @@ in
     syntaxHighlighting.enable = true;
     initExtraFirst = /*bash*/ ''
       export ZSH_CACHE_DIR=$HOME/.cache/zsh
-      mkdir -p $ZSH_CACHE_DIR/completions
+      fpath+=${pkgs.zsh-completions}/share/zsh/site-functions
 
       if [ -f $HOME/.config/zsh/.p10k.zsh ]; then
           source $HOME/.config/zsh/.p10k.zsh
-      fi 
+      fi
 
       _ZSH_COLOR_SCHEME_FILE=$HOME/.cache/wallust/sequences
       if [ -f "$_ZSH_COLOR_SCHEME_FILE" ]; then