diff --git a/.github/workflows/make-stages.yaml b/.github/workflows/make-stages.yaml
index 8d6f159..2c25ada 100644
--- a/.github/workflows/make-stages.yaml
+++ b/.github/workflows/make-stages.yaml
@@ -29,8 +29,5 @@ jobs:
       - name: 'make kubernetes'
         run: make kubernetes
       - uses: actions/checkout@v2
-      - name: 'make neovim'
-        run: make neovim
-      - uses: actions/checkout@v2
       - name: 'make nodejs'
-        run: make nodejs
+        run: make nodejs
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 9e74adf..781e638 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,49 @@ endif
 
 editor: editor-requisites neovim neovim-plugins emacs-dep emacs doom-emacs ## Configure text editor
 
+# ___  ___           _____ _______   __
+# |  \/  |          |  _  /  ___\ \ / /
+# | .  . | __ _  ___| | | \ `--. \ V / 
+# | |\/| |/ _` |/ __| | | |`--. \/   \ 
+# | |  | | (_| | (__\ \_/ /\__/ / /^\ \
+# \_|  |_/\__,_|\___|\___/\____/\/   \/
+macos-install:
+	/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+                                     
+macos-brew-dependencies: ## MacOS 13.X+ - Install basic MacOS utils
+	brew install coreutils neovim 
+	brew install gcc
+	brew install --cask rectangle
+	brew install --cask netnewswire
+	brew install --cask marta
+	brew install --cask vscodium
+	brew install --cask bitwarden
+	# brew install --cask alfred
+
+macos-brew-web-tools:
+	brew install --cask chromium
+	brew install --cask
+
+macos-brew-sre-software: ## Basic SRE software needed for daily work
+	brew tap tofuutils/tap
+	brew install tenv
+	brew install tldr tree gnu-tar ripgrep tmux jq gnupg
+
+macos-brew-dev-software: ## Installs development software
+	brew install --cask visual-studio-code
+	brew install go
+	brew install node@22
+
+macos-upgrade: ## Update and upgrade
+	brew update
+	brew list
+	brew outdated
+	brew upgrade
+	brew cleanup --prune=all --dry-run
+	tldr --update
+
+                                     
+
 #  ___ _ __ ___   __ _  ___ ___
 # / _ \ '_ ` _ \ / _` |/ __/ __|
 #|  __/ | | | | | (_| | (__\__ \
@@ -139,7 +182,7 @@ asdf-setup-kubectl:
 	asdf install kubectl latest:1.19.
 	asdf install kubectl latest:1.18.
 	asdf global kubectl latest
-=======
+
 clean: ## Render a destructive statement
 	@echo "rm -rf ${DOTFILES_DIR}"
 
@@ -149,4 +192,4 @@ clean: ## Render a destructive statement
 
 # nvm
 nodejs: 
-	curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
+	curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
\ No newline at end of file
diff --git a/config/aliases b/config/aliases
index 52a2afd..d68cb35 100644
--- a/config/aliases
+++ b/config/aliases
@@ -103,9 +103,4 @@ if [[ -f ${ALIASES_DIR}/functions/jump.sh ]] ; then
 	alias j=jump
 else
 	echo "[ERR] jump function not found - Check private repo"
-fi
-
-# Kubernetes
-alias kubectl="$(ls -1 /usr/local/bin/kubectl* | tail -n 1)"
-alias helm="$(ls -1 /usr/local/bin/helm* | tail -n 1)"
-alias argocd="$(ls -1 /usr/local/bin/argocd* | tail -n 1)"
+fi
\ No newline at end of file
diff --git a/config/zshrc b/config/zshrc
index 38d77f9..3e8ef62 100644
--- a/config/zshrc
+++ b/config/zshrc
@@ -4,10 +4,9 @@ plugins=(git)
 
 # User configuration
 
-source ~/.dotfiles/aliases
+source ~/.dotfiles/config/aliases
 
 # Functions
-source ~/.dotfiles/functions/movement.sh
 source ~/.dotfiles/functions/kubernetes.sh
 source ~/.dotfiles/functions/terraform.sh
 
@@ -86,4 +85,3 @@ fi
 if [[ -f "ASDF_BIN" ]]; then
   source /usr/local/share/zsh/site-functions/_kubectl
 fi
-