diff --git a/README.md b/README.md
index 51ea2af..645cd75 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ $ curl -O https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Fedora
 To bootstrap a Windows instance:
 
 ```console
-$ Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://code.infektor.net/config/bootstrap/raw/master/bootstrap-Windows.ps1'))
+$ Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://git.infektor.net/config/bootstrap/raw/update/bootstrap-Windows.ps1'))
 ```
 
 ## Package
diff --git a/bootstrap-Windows.ps1 b/bootstrap-Windows.ps1
index f1f83b9..0053998 100644
--- a/bootstrap-Windows.ps1
+++ b/bootstrap-Windows.ps1
@@ -1,26 +1,58 @@
-[CmdletBinding()]
-Param(
-  [Parameter(Mandatory=$true)]
-  [String]$email,
-  [String]$sshKeyType = "ed25519"
-)
+$choices = '&Yes', '&No'
+
+# Install 1Password
+$decision = $Host.UI.PromptForChoice('Install 1Password', 'Proceed?', $choices, 0)
+if ($decision -eq 0) {
+  $1password_installer = "$env:USERPROFILE/Downloads/1PasswordSetup-latest.exe"
+  Invoke-WebRequest -Uri "https://downloads.1password.com/win/1PasswordSetup-latest.exe" -OutFile "$1password_installer"
+  &$1password_installer
+  Remove-Item $1password_installer
+} else {
+  echo 'Skipping 1Password'
+}
+
+# Enable Hyper-V
+$decision = $Host.UI.PromptForChoice('Enable Hyper-V', 'Proceed?', $choices, 0)
+if ($decision -eq 0) {
+  Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
+} else {
+  echo 'Skipping Hyper-V'
+}
+
+# Enable Containters
+$decision = $Host.UI.PromptForChoice('Enable Containers', 'Proceed?', $choices, 0)
+if ($decision -eq 0) {
+  Enable-WindowsOptionalFeature -Online -FeatureName Containers -All
+} else {
+  echo 'Skipping Containers'
+}
+
+# Install Scoop
+# TODO: Set permanent user scope environment variables
+$scoop_installer = "$env:USERPROFILE/Downloads/ScoopInstaller.ps1"
+$nonElevatedCommand = {
+  Invoke-WebRequest -Uri https://get.scoop.sh -OutFile $scoop_installer
+  &$scoop_installer -ScoopDir "$env:LocalAppData/Scoop" -ScoopGlobalDir "$env:ProgramData/Scoop"
+}
+
+# Get the shell application object
+$shellApp = New-Object -ComObject "Shell.Application"
+
+# Run the command without elevation
+$shellApp.ShellExecute("powershell.exe", "-NoProfile -Command `"& { $nonElevatedCommand }`"", "", "open", 0)
+
+# Start-Process -NoNewWindow -Credential "$env:UserDomain\$env:UserName" -FilePath "powershell.exe" -ArgumentList "-NoProfile -Command & { & $($command) }"
+# Start-Process -FilePath "powershell.exe" -ArgumentList "-NoProfile -Command & { & $($command) }" -Credential $user -WindowStyle Hidden
 
 # Install Chocolatey
-Set-ExecutionPolicy Bypass -Scope Process -Force; [System.Net.ServicePointManager]::SecurityProtocol = [System.Net.ServicePointManager]::SecurityProtocol -bor 3072; iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
+iex ((New-Object System.Net.WebClient).DownloadString('https://community.chocolatey.org/install.ps1'))
 
-# Enable Hyper-V and containters
-Enable-WindowsOptionalFeature -Online -FeatureName Microsoft-Hyper-V -All
-Enable-WindowsOptionalFeature -Online -FeatureName Containers -All
-
-# Install OpenSSH and start service
-choco install --yes "--package-parameters=/SSHServerFeature" openssh
-Start-Service sshd
-Set-Service -Name sshd -StartupType 'Automatic'
-
-# generate keys and authorize them
-ssh-keygen -t "$sshKeyType" -C "$email" -f "$env:USERPROFILE/.ssh/$sshKeyType"
-# TODO: authorize public key for admin
-
-# Install Windows-Terminal and Debian
-choco install --yes microsoft-windows-terminal
-wsl --install --distribution Debia
+# Install SSH Server
+$decision = $Host.UI.PromptForChoice('Install SSH Server', 'Proceed?', $choices, 0)
+if ($decision -eq 0) {
+  choco install --yes "--package-parameters=/SSHServerFeature" openssh
+  Start-Service sshd
+  Set-Service -Name sshd -StartupType 'Automatic'
+} else {
+  echo 'Skipping SSH Server'
+}