diff --git a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
index 23f4719c..2b80eae7 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug-dispmanx.vgdbsettings
@@ -47,9 +47,9 @@
     <ToolchainID>
       <ID>com.visualgdb.raspberry_pi</ID>
       <Version>
-        <GCC>6.3.0</GCC>
-        <GDB>7.12</GDB>
-        <Revision>3</Revision>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>1</Revision>
       </Version>
     </ToolchainID>
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
diff --git a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
index 66d80145..8a2ebfb6 100644
--- a/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Debug.vgdbsettings
@@ -7,7 +7,7 @@
       <PathStyle>MinGWUnixSlash</PathStyle>
     </CustomSourceDirectories>
     <DeploymentHost>
-      <HostName>192.168.1.216</HostName>
+      <HostName>192.168.1.142</HostName>
       <Transport>SSH</Transport>
       <UserName>pi</UserName>
     </DeploymentHost>
@@ -47,9 +47,9 @@
     <ToolchainID>
       <ID>com.visualgdb.raspberry_pi</ID>
       <Version>
-        <GCC>6.3.0</GCC>
-        <GDB>7.12</GDB>
-        <Revision>4</Revision>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>1</Revision>
       </Version>
     </ToolchainID>
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
@@ -184,7 +184,7 @@
     </LaunchGDBSettings>
     <GenerateCtrlBreakInsteadOfCtrlC>false</GenerateCtrlBreakInsteadOfCtrlC>
     <DeploymentTargetPath>/home/pi/projects/amiberry/$(TargetFileName)</DeploymentTargetPath>
-    <X11WindowMode>Remote</X11WindowMode>
+    <X11WindowMode>Local</X11WindowMode>
     <KeepConsoleAfterExit>false</KeepConsoleAfterExit>
     <RunGDBUnderSudo>false</RunGDBUnderSudo>
     <DeploymentMode>Auto</DeploymentMode>
diff --git a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
index fba730e5..f2309377 100644
--- a/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release-dispmanx.vgdbsettings
@@ -50,9 +50,9 @@
     <ToolchainID>
       <ID>com.visualgdb.raspberry_pi</ID>
       <Version>
-        <GCC>6.3.0</GCC>
-        <GDB>7.12</GDB>
-        <Revision>3</Revision>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>1</Revision>
       </Version>
     </ToolchainID>
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
diff --git a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
index 4429cfcc..444403de 100644
--- a/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
+++ b/VisualGDB/Amiberry/Amiberry-Release.vgdbsettings
@@ -47,15 +47,14 @@
     <ToolchainID>
       <ID>com.visualgdb.raspberry_pi</ID>
       <Version>
-        <GCC>6.3.0</GCC>
-        <GDB>7.12</GDB>
-        <Revision>4</Revision>
+        <GCC>8.3.0</GCC>
+        <GDB>8.2.1</GDB>
+        <Revision>1</Revision>
       </Version>
     </ToolchainID>
     <ProjectFile>Amiberry.vcxproj</ProjectFile>
     <RemoteBuildEnvironment>
       <Records />
-      <EnvironmentSetupFiles />
     </RemoteBuildEnvironment>
     <ParallelJobCount>1</ParallelJobCount>
     <SuppressDirectoryChangeMessages>true</SuppressDirectoryChangeMessages>
diff --git a/VisualGDB/Amiberry/Amiberry.vcxproj b/VisualGDB/Amiberry/Amiberry.vcxproj
index a0558f5d..5dee1b2a 100644
--- a/VisualGDB/Amiberry/Amiberry.vcxproj
+++ b/VisualGDB/Amiberry/Amiberry.vcxproj
@@ -38,23 +38,23 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
+    <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug-dispmanx|VisualGDB'">
     <GNUConfigurationType>Debug</GNUConfigurationType>
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
+    <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
+    <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release-dispmanx|VisualGDB'">
     <ToolchainID>com.visualgdb.raspberry_pi</ToolchainID>
-    <ToolchainVersion>6.3.0/7.12/r4</ToolchainVersion>
+    <ToolchainVersion>8.3.0/8.2.1/r1</ToolchainVersion>
     <TargetName>$(ProjectName)-sdl2</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|VisualGDB'">