diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2ad06a8cbe64..532a5b8c856d 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -202,10 +202,10 @@ jobs:
         include:
           # x86 builds
           - name: diablo+patch
-            cmakeargs: '-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DUSE_PATCH=ON -DNONET=ON'
+            cmakeargs: '-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DUSE_PATCH=ON'
             artifact: 'diablo-nightly-mingw-w9x.zip'
           - name: hellfire+patch
-            cmakeargs: '-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DUSE_PATCH=ON -DNONET=ON -DHELLFIRE=ON'
+            cmakeargs: '-DDEVILUTIONX_SYSTEM_LIBSODIUM=OFF -DUSE_PATCH=ON -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-mingw-w9x.zip'
     steps:
     - name: Checkout
@@ -791,16 +791,16 @@ jobs:
       matrix:
         include:
           - name: diablo
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF'
             artifact: 'diablo-nightly-vita.vpk'
           - name: hellfire
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -DHELLFIRE=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-vita.vpk'
           - name: diablo+patch
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -D USE_PATCH=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -D USE_PATCH=ON'
             artifact: 'diablo-nightly-vitap.vpk'
           - name: hellfire+patch
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -D USE_PATCH=ON -DHELLFIRE=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -D USE_PATCH=ON -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-vitap.vpk'
     runs-on: ubuntu-latest
     container: vitasdk/vitasdk:latest
@@ -838,19 +838,19 @@ jobs:
       matrix:
         include:
           - name: diablo
-            cmakeargs: '-DNONET=ON'
+            cmakeargs: ''
             artifact: 'diablo-nightly-3ds.3dsx'
             cia: 'diablo-nightly-3ds.cia'
           - name: hellfire
-            cmakeargs: '-DNONET=ON -DHELLFIRE=ON'
+            cmakeargs: '-DHELLFIRE=ON'
             artifact: 'hellfire-nightly-3ds.3dsx'
             cia: 'hellfire-nightly-3ds.cia'
           - name: diablo+patch
-            cmakeargs: '-DNONET=ON -D USE_PATCH=ON'
+            cmakeargs: '-D USE_PATCH=ON'
             artifact: 'diablo-nightly-3dsp.3dsx'
             cia: 'diablo-nightly-3dsp.cia'
           - name: hellfire+patch
-            cmakeargs: '-DNONET=ON -D USE_PATCH=ON -DHELLFIRE=ON'
+            cmakeargs: '-D USE_PATCH=ON -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-3dsp.3dsx'
             cia: 'hellfire-nightly-3dsp.cia'
     runs-on: ubuntu-latest
@@ -908,16 +908,16 @@ jobs:
       matrix:
         include:
           - name: diablo
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF'
             artifact: 'diablo-nightly-switch.nro'
           - name: hellfire
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -DHELLFIRE=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-switch.nro'
           - name: diablo+patch
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -D USE_PATCH=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -D USE_PATCH=ON'
             artifact: 'diablo-nightly-switchp.nro'
           - name: hellfire+patch
-            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -DNONET=ON -D USE_PATCH=ON -DHELLFIRE=ON'
+            cmakeargs: '-D DEVILUTIONX_SYSTEM_SDL2=OFF -D USE_PATCH=ON -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-switchp.nro'
     runs-on: ubuntu-latest
     container: devkitpro/devkita64:latest
@@ -959,16 +959,16 @@ jobs:
       matrix:
         include:
           - name: diablo
-            cmakeargs: '-DNONET=ON'
+            cmakeargs: ''
             artifact: 'diablo-nightly-amiga'
           - name: hellfire
-            cmakeargs: '-DNONET=ON -DHELLFIRE=ON'
+            cmakeargs: '-DHELLFIRE=ON'
             artifact: 'hellfire-nightly-amiga'
           - name: diablo+patch
-            cmakeargs: '-DNONET=ON -D USE_PATCH=ON'
+            cmakeargs: '-D USE_PATCH=ON'
             artifact: 'diablo-nightly-amigap'
           - name: hellfire+patch
-            cmakeargs: '-DNONET=ON -D USE_PATCH=ON -DHELLFIRE=ON'
+            cmakeargs: '-D USE_PATCH=ON -DHELLFIRE=ON'
             artifact: 'hellfire-nightly-amigap'
     runs-on: ubuntu-latest
     container: amigadev/crosstools:m68k-amigaos-gcc10
diff --git a/CMake/amiga_defs.cmake b/CMake/amiga_defs.cmake
index 0b6e70737281..31d10d37e6f1 100644
--- a/CMake/amiga_defs.cmake
+++ b/CMake/amiga_defs.cmake
@@ -3,9 +3,10 @@ set(ASAN OFF)
 set(UBSAN OFF)
 
 # General build options.
-set(NONET ON)
 set(NOMEMCCPY ON)
 set(USE_SDL1 ON)
+#set(NONET ON)
+set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
 
 #set(TTF_FONT_NAME \"LiberationSerif-Bold.ttf\")
 # Enable exception support as they are used in dvlnet code
diff --git a/CMake/n3ds_defs.cmake b/CMake/n3ds_defs.cmake
index f47ca4315c13..6450441f2c49 100644
--- a/CMake/n3ds_defs.cmake
+++ b/CMake/n3ds_defs.cmake
@@ -6,7 +6,8 @@ set(UBSAN OFF)
 # The 3ds build handles the stripping in a custom way.
 set(USE_SDL1 ON)
 set(DISABLE_STRIP ON)
-#set(ZEROTIER OFF)
+#set(NONET ON)
+set(ZEROTIER OFF)
 # Disable system dependencies.
 set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
 
diff --git a/CMake/ps4_defs.cmake b/CMake/ps4_defs.cmake
index dbc6d1b41721..9d84f80bfce3 100644
--- a/CMake/ps4_defs.cmake
+++ b/CMake/ps4_defs.cmake
@@ -6,8 +6,9 @@ set(UBSAN OFF)
 # If the executable is stripped, create-fself fails with:
 # Failed to build FSELF: no symbol section
 set(DISABLE_STRIP ON)
-set(DISABLE_LTO ON)
-set(NONET ON)
+#set(DISABLE_LTO ON)
+#set(NONET ON)
+set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
 #set(DISCORD_INTEGRATION OFF)
 #set(BUILD_TESTING OFF)
 #set(NOEXIT ON)
diff --git a/CMake/ps5_defs.cmake b/CMake/ps5_defs.cmake
index 5002117ebb33..8620d5275e3e 100644
--- a/CMake/ps5_defs.cmake
+++ b/CMake/ps5_defs.cmake
@@ -7,7 +7,7 @@ set(UBSAN OFF)
 # Failed to build FSELF: no symbol section
 #set(DISABLE_STRIP ON)
 #set(DISABLE_LTO ON)
-set(NONET ON)
+#set(NONET ON)
 set(NOMEMCCPY ON)
 #set(DISCORD_INTEGRATION OFF)
 #set(BUILD_TESTING OFF)
diff --git a/CMake/switch_defs.cmake b/CMake/switch_defs.cmake
index a5e4ecdf5fe1..3a0c99258e98 100644
--- a/CMake/switch_defs.cmake
+++ b/CMake/switch_defs.cmake
@@ -3,7 +3,8 @@ set(ASAN OFF)
 set(UBSAN OFF)
 
 # General build options.
-#set(ZEROTIER OFF)
+#set(NONET ON)
+set(ZEROTIER OFF)
 # Disable system dependencies.
 set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
 
diff --git a/CMake/vita_defs.cmake b/CMake/vita_defs.cmake
index de9b835beee8..eb9c656337d0 100644
--- a/CMake/vita_defs.cmake
+++ b/CMake/vita_defs.cmake
@@ -5,7 +5,8 @@ set(UBSAN OFF)
 # General build options.
 # The Vita build needs the information
 set(DISABLE_STRIP ON)
-#set(ZEROTIER OFF)
+#set(NONET ON)
+set(ZEROTIER OFF)
 # Disable system dependencies.
 set(DEVILUTIONX_SYSTEM_LIBSODIUM OFF)
 
diff --git a/CMake/windows9x_defs.cmake b/CMake/windows9x_defs.cmake
index b9fbb621d8af..2ec76d74e63f 100644
--- a/CMake/windows9x_defs.cmake
+++ b/CMake/windows9x_defs.cmake
@@ -1,8 +1,9 @@
 set(ASAN OFF)
 set(UBSAN OFF)
 
-#set(NONET ON)
 set(USE_SDL1 ON)
+#set(NONET ON)
+set(ZEROTIER OFF)
 #set(DEVILUTIONX_SYSTEM_BZIP2 OFF)
 #set(DEVILUTIONX_SYSTEM_LIBFMT OFF)
 #set(DEVILUTIONX_STATIC_LIBSODIUM OFF)