diff --git a/ubuntu-post-install.sh b/ubuntu-post-install.sh
index e91ccbd..3bb2dd4 100644
--- a/ubuntu-post-install.sh
+++ b/ubuntu-post-install.sh
@@ -54,7 +54,14 @@ check_command "Dipendenze base"
 # === GOOGLE CHROME ===
 print_status "Installazione Google Chrome..."
 wget -q -O - https://dl.google.com/linux/linux_signing_key.pub | sudo gpg --dearmor -o /usr/share/keyrings/googlechrome-keyring.gpg
-echo "deb [arch=amd64 signed-by=/usr/share/keyrings/googlechrome-keyring.gpg] http://dl.google.com/linux/chrome/deb/ stable main" | sudo tee /etc/apt/sources.list.d/google-chrome.list
+sudo tee /etc/apt/sources.list.d/google-chrome.sources > /dev/null <<EOF
+Types: deb
+URIs: http://dl.google.com/linux/chrome/deb/
+Suites: stable
+Components: main
+Architectures: amd64
+Signed-By: /usr/share/keyrings/googlechrome-keyring.gpg
+EOF
 sudo apt update
 sudo apt install -y google-chrome-stable
 check_command "Google Chrome"
@@ -63,7 +70,14 @@ check_command "Google Chrome"
 print_status "Installazione Visual Studio Code..."
 wget -qO- https://packages.microsoft.com/keys/microsoft.asc | gpg --dearmor > packages.microsoft.gpg
 sudo install -o root -g root -m 644 packages.microsoft.gpg /etc/apt/trusted.gpg.d/
-sudo sh -c 'echo "deb [arch=amd64,arm64,armhf signed-by=/etc/apt/trusted.gpg.d/packages.microsoft.gpg] https://packages.microsoft.com/repos/code stable main" > /etc/apt/sources.list.d/vscode.list'
+sudo tee /etc/apt/sources.list.d/vscode.sources > /dev/null <<EOF
+Types: deb
+URIs: https://packages.microsoft.com/repos/code
+Suites: stable
+Components: main
+Architectures: amd64 arm64 armhf
+Signed-By: /etc/apt/trusted.gpg.d/packages.microsoft.gpg
+EOF
 sudo apt update
 sudo apt install -y code
 check_command "Visual Studio Code"
@@ -102,37 +116,30 @@ print_success "Profili VS Code creati"
 # Ora installiamo le estensioni per ogni profilo
 print_status "Installazione estensioni per profilo Default..."
 code --profile "Default" --install-extension ms-vscode.vscode-git
-code --profile "Default" --install-extension charliermarsh.ruff
-code --profile "Default" --install-extension google.geminicodeassist
-code --profile "Default" --install-extension ms-vscode.theme-tomorrowkit
-code --profile "Default" --install-extension ms-vscode.vscode-git
 code --profile "Default" --install-extension pkief.material-icon-theme
 check_command "Estensioni profilo Default"
 
 print_status "Installazione estensioni per profilo Python..."
-code --profile "Python" --install-extension ms-python.black-formatter
-code --profile "Python" --install-extension ms-python.debugpy
-code --profile "Python" --install-extension ms-python.flake8
-code --profile "Python" --install-extension ms-python.pylint
 code --profile "Python" --install-extension ms-python.python
-code --profile "Python" --install-extension ms-python.python-tools
-code --profile "Python" --install-extension ms-python.vscode-pylance
-code --profile "Python" --install-extension ms-python.vscode-pyright
+code --profile "Python" --install-extension ms-python.flake8
+code --profile "Python" --install-extension charliermarsh.ruff
+code --profile "Python" --install-extension ms-python.pylint
+code --profile "Python" --install-extension ms-python.black-formatter
+code --profile "Python" --install-extension ms-vscode.vscode-git
 check_command "Estensioni profilo Python"
 
 print_status "Installazione estensioni per profilo Rust..."
-code --profile "Rust" --install-extension fill-labs.dependi
-code --profile "Rust" --install-extension formulahendry.code-runner
 code --profile "Rust" --install-extension rust-lang.rust-analyzer
+code --profile "Rust" --install-extension vadimcn.vscode-lldb
 code --profile "Rust" --install-extension serayuzgur.crates
-code --profile "Rust" --install-extension tamasfe.even-better-toml
-code --profile "Rust" --install-extension usernamehw.errorlens
+code --profile "Rust" --install-extension ms-vscode.vscode-git
 check_command "Estensioni profilo Rust"
 
 print_status "Installazione estensioni per profilo Web..."
 code --profile "Web" --install-extension ms-vscode.vscode-typescript-next
 code --profile "Web" --install-extension bradlc.vscode-tailwindcss
 code --profile "Web" --install-extension formulahendry.auto-rename-tag
+code --profile "Web" --install-extension ms-vscode.vscode-git
 code --profile "Web" --install-extension esbenp.prettier-vscode
 check_command "Estensioni profilo Web"
 
@@ -146,7 +153,13 @@ check_command "FileZilla"
 # === DBEAVER ===
 print_status "Installazione DBeaver..."
 curl -fsSL https://dbeaver.io/debs/dbeaver.gpg.key | sudo gpg --dearmor -o /usr/share/keyrings/dbeaver.gpg
-echo "deb [signed-by=/usr/share/keyrings/dbeaver.gpg] https://dbeaver.io/debs/dbeaver-ce /" | sudo tee /etc/apt/sources.list.d/dbeaver.list
+sudo tee /etc/apt/sources.list.d/dbeaver.sources > /dev/null <<EOF
+Types: deb
+URIs: https://dbeaver.io/debs/dbeaver-ce
+Suites: /
+Components:
+Signed-By: /usr/share/keyrings/dbeaver.gpg
+EOF
 sudo apt update
 sudo apt install -y dbeaver-ce
 check_command "DBeaver"
@@ -154,7 +167,14 @@ check_command "DBeaver"
 # === WARP TERMINAL ===
 print_status "Installazione Warp Terminal..."
 curl -fsSL https://releases.warp.dev/linux/keys/warp.asc | sudo gpg --dearmor -o /usr/share/keyrings/warp.gpg
-echo "deb [arch=amd64 signed-by=/usr/share/keyrings/warp.gpg] https://releases.warp.dev/linux/deb stable main" | sudo tee /etc/apt/sources.list.d/warp.list
+sudo tee /etc/apt/sources.list.d/warp.sources > /dev/null <<EOF
+Types: deb
+URIs: https://releases.warp.dev/linux/deb
+Suites: stable
+Components: main
+Architectures: amd64
+Signed-By: /usr/share/keyrings/warp.gpg
+EOF
 sudo apt update
 sudo apt install -y warp-terminal
 check_command "Warp Terminal"
@@ -162,7 +182,14 @@ check_command "Warp Terminal"
 # === INSOMNIA ===
 print_status "Installazione Insomnia..."
 curl -1sLf 'https://packages.konghq.com/public/insomnia/gpg.DE2A7741A397C129.key' | sudo gpg --dearmor -o /usr/share/keyrings/insomnia.gpg
-echo "deb [arch=amd64 signed-by=/usr/share/keyrings/insomnia.gpg] https://packages.konghq.com/public/insomnia/deb/ubuntu $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/insomnia.list
+sudo tee /etc/apt/sources.list.d/insomnia.sources > /dev/null <<EOF
+Types: deb
+URIs: https://packages.konghq.com/public/insomnia/deb/ubuntu
+Suites: $(lsb_release -cs)
+Components: main
+Architectures: amd64
+Signed-By: /usr/share/keyrings/insomnia.gpg
+EOF
 sudo apt update
 sudo apt install -y insomnia
 check_command "Insomnia"
@@ -210,11 +237,17 @@ print_status "Installazione Incus..."
 # Aggiunta repository Zabbly per Incus
 sudo mkdir -p /etc/apt/keyrings/
 curl -fsSL https://pkgs.zabbly.com/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/zabbly.gpg
-echo "deb [signed-by=/etc/apt/keyrings/zabbly.gpg] https://pkgs.zabbly.com/incus/stable $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/zabbly-incus-stable.list
+sudo tee /etc/apt/sources.list.d/zabbly-incus.sources > /dev/null <<EOF
+Types: deb
+URIs: https://pkgs.zabbly.com/incus/stable
+Suites: $(lsb_release -cs)
+Components: main
+Signed-By: /etc/apt/keyrings/zabbly.gpg
+EOF
 sudo apt update
 
 # Installazione Incus
-sudo apt install -y incus incus-client incus-ui-canonical
+sudo apt install -y incus incus-ui-canonical
 check_command "Incus"
 
 # Configurazione iniziale Incus
@@ -310,6 +343,7 @@ echo "  ✓ DBeaver"
 echo "  ✓ Warp Terminal"
 echo "  ✓ Insomnia"
 echo "  ✓ MQTTX"
+echo "  ✓ FortiClient VPN"
 echo "  ✓ Git"
 echo "  ✓ Python3 e pip"
 echo "  ✓ Rust"
@@ -322,6 +356,7 @@ echo "1. Riavvia il sistema o disconnettiti/riconnettiti per applicare tutte le
 echo "2. Git è già configurato con le credenziali fornite"
 echo "3. Per Incus, verifica la configurazione con: incus list"
 echo "4. I file .desktop sono stati scaricati dal repository Gitea alex/desktop-app"
+echo "5. FortiClient VPN è installato - configuralo con i dati del tuo server FortiGate"
 
 print_status "=== CREDENZIALI GIT CONFIGURATE ==="
 echo "Repository Gitea: https://gitbat.duckdns.org:44443/"
@@ -332,7 +367,7 @@ echo ""
 
 print_status "=== UTILIZZO PROFILI VS CODE ==="
 echo "Per aprire VS Code con un profilo specifico:"
-echo "  code --profile \"Default\" /percorso/progetto     # Profilo generale"
+echo "  code --profile \"Default\" /percorso/progetto      # Profilo generale"
 echo "  code --profile \"Python\" /percorso/progetto      # Profilo Python"
 echo "  code --profile \"Rust\" /percorso/progetto        # Profilo Rust"
 echo "  code --profile \"Web\" /percorso/progetto         # Profilo Web"