diff --git a/machines/altaria/configuration.nix b/machines/altaria/configuration.nix
index 265289e..956660e 100644
--- a/machines/altaria/configuration.nix
+++ b/machines/altaria/configuration.nix
@@ -23,6 +23,9 @@
   };
 
   services = {
+    # Enable the tailscale VPN
+    vpn.enable = true;
+
     openssh = {
       enable = true;
       startWhenNeeded = true;
diff --git a/users/fmzakari/vscode.nix b/users/fmzakari/vscode.nix
index ff4e3ed..0e5f8a8 100644
--- a/users/fmzakari/vscode.nix
+++ b/users/fmzakari/vscode.nix
@@ -33,6 +33,10 @@
       };
     };
   };
+  go = {
+  };
+  java = {
+  };
   telemetry = {
     "redhat.telemetry.enabled" = false;
     "telemetry.telemetryLevel" = "off";
@@ -71,6 +75,10 @@ in {
         ms-python.mypy-type-checker
         ms-python.isort
         ms-python.black-formatter
+        # golang
+        ms-vscode.Go
+        # java
+        redhat.java
       ])
       ++ (with pkgs.vscode-marketplace-release; [
         github.copilot
@@ -87,6 +95,8 @@ in {
       // telemetry
       // window
       // nix
-      // cpp;
+      // cpp
+      // java
+      // go;
   };
 }