diff --git a/REMOTE_SETUP.md b/REMOTE_SETUP.md
index 8dccf81..fea9a5a 100644
--- a/REMOTE_SETUP.md
+++ b/REMOTE_SETUP.md
@@ -69,10 +69,10 @@ To create a separate SSH key to exclusively use for this bootcamp use the follow
 
 ```bash
 # replace your_email@example.com, this is purely informative and allows you to remember the use of this key
-ssh-keygen -t ed25519 -f ~/.ssh/de-bootcamp -C your_email@example.com
+ssh-keygen -t ed25519 -f ~/.ssh/ds-bootcamp -C your_email@example.com
 ```
 
-Your new SSH Key will be named `de-bootcamp`. Make sure to remember it for later!
+Your new SSH Key will be named `ds-bootcamp`. Make sure to remember it for later!
 </details>
 
 
@@ -207,7 +207,7 @@ ssh -i 👉PATH_TO_YOUR_PRIVATE_KEY👈 lewagon@👉YOUR_IP_ADDRESS👈
   Error:
 
   ``` bash
-  ssh -i ~/.ssh/id_ed25519_data_eng_setup lewagon@34.52.208.105
+  ssh -i ~/.ssh/id_ed25519 lewagon@34.52.208.105
   ssh: connect to host 34.52.208.105 port 22: Operation timed out
   ```
 
@@ -220,7 +220,7 @@ ssh -i 👉PATH_TO_YOUR_PRIVATE_KEY👈 lewagon@👉YOUR_IP_ADDRESS👈
   <summary>❌ Connection refused</summary>
 
   ``` bash
-  ssh -i ~/.ssh/id_ed25519_data_eng_setup lewagon@34.52.208.105
+  ssh -i ~/.ssh/id_ed25519 lewagon@34.52.208.105
   ssh: connect to host 34.52.208.105 port 22: Connection refused
   ```
 
@@ -333,7 +333,7 @@ You can now change Host to whatever you would like to see as the name of your co
 
 ```bash
 # For instance
-Host "de-bootcamp-vm"
+Host "ds-bootcamp-vm"
   HostName 34.77.50.76 # replace with your VM's public IP address
   IdentityFile <file path for your ssh key>
   User <username>
diff --git a/VM.md b/VM.md
index ba150d9..bf683e2 100644
--- a/VM.md
+++ b/VM.md
@@ -69,10 +69,10 @@ To create a separate SSH key to exclusively use for this bootcamp use the follow
 
 ```bash
 # replace your_email@example.com, this is purely informative and allows you to remember the use of this key
-ssh-keygen -t ed25519 -f ~/.ssh/de-bootcamp -C your_email@example.com
+ssh-keygen -t ed25519 -f ~/.ssh/ds-bootcamp -C your_email@example.com
 ```
 
-Your new SSH Key will be named `de-bootcamp`. Make sure to remember it for later!
+Your new SSH Key will be named `ds-bootcamp`. Make sure to remember it for later!
 </details>
 
 
@@ -316,7 +316,7 @@ You can now change Host to whatever you would like to see as the name of your co
 
 ```bash
 # For instance
-Host "de-bootcamp-vm"
+Host "ds-bootcamp-vm"
   HostName 34.77.50.76 # replace with your VM's public IP address
   IdentityFile <file path for your ssh key>
   User <username>
diff --git a/_partials/vm_test.md b/_partials/vm_test.md
index c1e55a2..a5f0757 100644
--- a/_partials/vm_test.md
+++ b/_partials/vm_test.md
@@ -35,7 +35,7 @@ ssh -i 👉PATH_TO_YOUR_PRIVATE_KEY👈 lewagon@👉YOUR_IP_ADDRESS👈
   Error:
 
   ``` bash
-  ssh -i ~/.ssh/id_ed25519_data_eng_setup lewagon@34.52.208.105
+  ssh -i ~/.ssh/id_ed25519 lewagon@34.52.208.105
   ssh: connect to host 34.52.208.105 port 22: Operation timed out
   ```
 
@@ -48,7 +48,7 @@ ssh -i 👉PATH_TO_YOUR_PRIVATE_KEY👈 lewagon@👉YOUR_IP_ADDRESS👈
   <summary>❌ Connection refused</summary>
 
   ``` bash
-  ssh -i ~/.ssh/id_ed25519_data_eng_setup lewagon@34.52.208.105
+  ssh -i ~/.ssh/id_ed25519 lewagon@34.52.208.105
   ssh: connect to host 34.52.208.105 port 22: Connection refused
   ```
 
diff --git a/builds/REMOTE_SETUP.yml b/builds/REMOTE_SETUP.yml
index 9a2f660..8739d72 100644
--- a/builds/REMOTE_SETUP.yml
+++ b/builds/REMOTE_SETUP.yml
@@ -4,12 +4,16 @@ locales: [en]
 partials:
   - intro
   - setup/github
-  - de_setup/ssh_key
+  - name: de_setup/ssh_key
+    vars:
+      key_name: ds-bootcamp
   - vm_register
   - vm_start
   - vm_test
   - de_setup/win_vscode
-  - de_setup/vscode_remote_ssh
+  - name: de_setup/vscode_remote_ssh
+    vars:
+      vm_hostname: ds-bootcamp-vm
   - vscode_extensions
   - setup/vscode_aifeatures
   - setup/cli_tools
diff --git a/builds/VM.yml b/builds/VM.yml
index ef37889..5b83606 100644
--- a/builds/VM.yml
+++ b/builds/VM.yml
@@ -4,11 +4,15 @@ locales: [en, es]
 partials:
   - intro
   - setup/github
-  - de_setup/ssh_key
+  - name: de_setup/ssh_key
+    vars:
+      key_name: ds-bootcamp
   - de_setup/gcp_setup
   - de_setup/virtual_machine
   - de_setup/win_vscode
-  - de_setup/vscode_remote_ssh
+  - name: de_setup/vscode_remote_ssh
+    vars:
+      vm_hostname: ds-bootcamp-vm
   - vscode_extensions
   - setup/vscode_aifeatures
   - setup/cli_tools