diff --git a/tasks/devel-Archlinux.yml b/tasks/devel-Archlinux.yml
index 8cf783d..959e912 100644
--- a/tasks/devel-Archlinux.yml
+++ b/tasks/devel-Archlinux.yml
@@ -10,7 +10,7 @@
         state: present
       vars:
         packages:
-          - visual-studio-code
+          - code
     - name: vscode - Basics - Additional dependencies
       package:
         name: "{{ packages }}"
@@ -18,10 +18,14 @@
       vars:
         packages:
           - plantuml
+    - name: vscode - Basics - Create settings directory
+      file:
+        path: "{{ ansible_user_dir }}/.config/Code/User"
+        state: directory
     - name: vscode - Basics - Copy global settings
       copy:
         src: "{{ role_path }}/files/vscode-settings.json"
-        dest: ~/.config/Code/User/settings.json
+        dest: "{{ ansible_user_dir }}/.config/Code/User/settings.json"
   when: user_vscode == true
 
 # Dev Env - C/C++ Development Tools
diff --git a/tasks/devel-Darwin.yml b/tasks/devel-Darwin.yml
index f6eb15a..67a1cb2 100644
--- a/tasks/devel-Darwin.yml
+++ b/tasks/devel-Darwin.yml
@@ -25,10 +25,14 @@
       vars:
         packages:
           - graphviz
+    - name: vscode - Basics - Create settings directory
+      file:
+        path: "{{ ansible_user_dir }}/Library/Application Support/Code/User"
+        state: directory
     - name: vscode - Basics - Copy global settings
       copy:
         src: "{{ role_path }}/files/vscode-settings.json"
-        dest: ~/Library/Application Support/Code/User/settings.json
+        dest: "{{ ansible_user_dir }}/Library/Application Support/Code/User/settings.json"
   when: user_vscode == true
 
 # Dev Env - C/C++ Development Tools
diff --git a/tasks/devel-Debian.yml b/tasks/devel-Debian.yml
index 8ad024d..09ec4be 100644
--- a/tasks/devel-Debian.yml
+++ b/tasks/devel-Debian.yml
@@ -4,6 +4,17 @@
 # Install Visual Studio Code and Set Basic Configuration
 - name: vscode - Basics
   block:
+    - name: vscode - Basics - Add Repo Key
+      become: yes
+      apt_key:
+        url: "https://packages.microsoft.com/keys/microsoft.asc"
+        state: present
+    - name: vscode - Basics - Add Repo
+      become: yes
+      apt_repository:
+        repo: "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main"
+        filename: vscode
+        state: present
     - name: vscode - Basics - Install
       become: yes
       package:
@@ -11,7 +22,7 @@
         state: present
       vars:
         packages:
-          - visual-studio-code
+          - code
     - name: vscode - Basics - Additional dependencies
       become: yes
       package:
@@ -21,10 +32,14 @@
         packages:
           - plantuml
           - graphviz
+    - name: vscode - Basics - Create settings directory
+      file:
+        path: "{{ ansible_user_dir }}/.config/Code/User"
+        state: directory
     - name: vscode - Basics - Copy global settings
       copy:
         src: "{{ role_path }}/files/vscode-settings.json"
-        dest: ~/.config/Code/User/settings.json
+        dest: "{{ ansible_user_dir }}/.config/Code/User/settings.json"
   when: user_vscode == true
 
 # Dev Env - C/C++ Development Tools
diff --git a/tasks/devel.yml b/tasks/devel.yml
index f0614ec..959e563 100644
--- a/tasks/devel.yml
+++ b/tasks/devel.yml
@@ -95,7 +95,7 @@
     - name: vscode - Golang - Configure VS Code
       shell: |
         PATH=/usr/local/bin:$PATH
-        code --install-extension ms-vscode.go
+        code --install-extension golang.go
   when: user_vscode == true and user_lang_golang == true
 
 # VS Code - LaTeX Distribution