diff --git a/terraria-tmodloader/terraria-tmodloader.json b/terraria-tmodloader/terraria-tmodloader.json
index da9f3cd..e9de3d6 100644
--- a/terraria-tmodloader/terraria-tmodloader.json
+++ b/terraria-tmodloader/terraria-tmodloader.json
@@ -308,7 +308,19 @@
       "commands": [
         "rm -rf dotnet",
         "mkdir -p dotnet",
-        "tar -xzf dotnet-runtime-${dotnetversion}-linux-${arch}.tar.gz -C dotnet",
+        "rm -rf dotnet-runtime-linux-${arch}.tar.gz"
+      ]
+    },
+    {
+      "if": "env == 'host'",
+      "type": "extract",
+      "source": "dotnet-runtime-${dotnetversion}-linux-${arch}.tar.gz",
+      "destination": "dotnet"
+    },
+    {
+      "if": "env == 'host'",
+      "type": "command",
+      "commands": [
         "rm -rf dotnet-runtime-linux-${arch}.tar.gz"
       ]
     },
@@ -318,10 +330,13 @@
         "https://github.com/tModLoader/tModLoader/releases/download/${tversion}/tModLoader.zip"
       ]
     },
+    {
+      "type": "extract",
+      "source": "tModLoader.zip"
+    },
     {
       "type": "command",
       "commands": [
-        "unzip tModLoader.zip -d .",
         "rm tModLoader.zip",
         "mkdir -p ./${wp}"
       ]
diff --git a/terraria-tshock/terraria-tshock.json b/terraria-tshock/terraria-tshock.json
index e9048b5..a220ff9 100644
--- a/terraria-tshock/terraria-tshock.json
+++ b/terraria-tshock/terraria-tshock.json
@@ -120,7 +120,19 @@
       "commands": [
         "rm -rf dotnet",
         "mkdir -p dotnet",
-        "tar -xzf dotnet-runtime-${dotnetversion}-linux-${arch}.tar.gz -C dotnet",
+        "rm -rf dotnet-runtime-linux-${arch}.tar.gz"
+      ]
+    },
+    {
+      "if": "env == 'host'",
+      "type": "extract",
+      "source": "dotnet-runtime-${dotnetversion}-linux-${arch}.tar.gz",
+      "destination": "dotnet"
+    },
+    {
+      "if": "env == 'host'",
+      "type": "command",
+      "commands": [
         "rm -rf dotnet-runtime-linux-${arch}.tar.gz"
       ]
     },
@@ -130,11 +142,19 @@
         "https://github.com/Pryaxis/TShock/releases/download/v${tshockversion}/TShock-${tshockversion}-for-Terraria-${version}-linux-${arch}-Release.zip"
       ]
     },
+    {
+      "type": "extract",
+      "source": "TShock-${tshockversion}-for-Terraria-${version}-linux-${arch}-Release.zip",
+      "destination": "."
+    },
+    {
+      "type": "extract",
+      "source": "TShock-Beta-linux-${arch}-Release.tar",
+      "destination": "."
+    },
     {
       "type": "command",
       "commands": [
-        "unzip TShock-${tshockversion}-for-Terraria-${version}-linux-${arch}-Release.zip",
-        "tar xf TShock-Beta-linux-${arch}-Release.tar",
         "mkdir worlds",
         "rm -rf TShock-${tshockversion}-for-Terraria-${version}-linux-${arch}-Release.zip",
         "rm -rf TShock-Beta-linux-${arch}-Release.tar"
diff --git a/terraria-vanilla/terraria-vanilla.json b/terraria-vanilla/terraria-vanilla.json
index 0b2d8e1..ea40bdb 100644
--- a/terraria-vanilla/terraria-vanilla.json
+++ b/terraria-vanilla/terraria-vanilla.json
@@ -257,11 +257,15 @@
         "https://terraria.org/api/download/pc-dedicated-server/terraria-server-${version}.zip"
       ]
     },
+    {
+      "type": "extract",
+      "source": "terraria-server-${version}.zip",
+      "destination": "."
+    },
     {
       "type": "command",
       "commands": [
         "rm -rf ./server",
-        "unzip terraria-server-${version}.zip",
         "mkdir ./server",
         "cp -r ./${version}/Linux/. ./server",
         "chmod +x ./server/TerrariaServer",