diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo
index b115bba0..4663912d 100644
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo and b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/param.sfo differ
diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/NPWR06859_00/TROPHY.TRP b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/NPWR06859_00/TROPHY.TRP
deleted file mode 100644
index 4b97d900..00000000
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/NPWR06859_00/TROPHY.TRP and /dev/null differ
diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Bronz.png b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Bronz.png
deleted file mode 100644
index 84905268..00000000
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Bronz.png and /dev/null differ
diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Gold.png b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Gold.png
deleted file mode 100644
index b17d2fbc..00000000
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Gold.png and /dev/null differ
diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Group.png b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Group.png
deleted file mode 100644
index 64f4a7e1..00000000
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Group.png and /dev/null differ
diff --git a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Silver.png b/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Silver.png
deleted file mode 100644
index bdd3a45d..00000000
Binary files a/Minecraft.Client/Common/Postbuilds/Contents/Orbis/sce_sys/trophy/trophy_Silver.png and /dev/null differ
diff --git a/Minecraft.Client/Common/Postbuilds/Executables/gengp4_app.exe b/Minecraft.Client/Common/Postbuilds/Executables/gengp4_app.exe
new file mode 100644
index 00000000..e8e8dd04
Binary files /dev/null and b/Minecraft.Client/Common/Postbuilds/Executables/gengp4_app.exe differ
diff --git a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1
index a30e2352..5c61bbf3 100644
--- a/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1
+++ b/Minecraft.Client/Common/Postbuilds/Orbis-postbuild.ps1
@@ -107,23 +107,40 @@ foreach ($dir in $delDirs) {
 }
 
 # Make Orbis PKG
+$tools = Join-Path $env:SCE_ROOT_DIR "\ORBIS\Tools\Publishing Tools\bin"
 $pkgSrc = Join-Path $OutDir "PS4_GAME"
 
-$genGp4 = Join-Path $tools "gengp4_app.exe"
+$genGp4 = Join-Path $ProjectDir "Common\Postbuilds\Executables\gengp4_app.exe"
 $pubCmd = Join-Path $tools "orbis-pub-cmd.exe"
 
-$repoRoot = Split-Path ($ProjectDir.TrimEnd('\', '/')) -Parent
-$pkgPath  = Join-Path $repoRoot "Minecraft.Client.pkg"
-$pkgSrc   = Join-Path $OutDir "PS4_GAME"
+$pkgPath  = Join-Path $OutDir "Minecraft.Client.pkg"
+$gp4Name = $pkgSrc.TrimEnd('\','/')
+$gp4File = "$gp4Name.gp4"
 
 if (Test-Path $pkgPath) {
     Remove-Item $pkgPath -Force
 }
 
-#if (-not (Test-Path $genGp4)) {
-#    Write-Host "Orbis Postbuild: gengp4_app.exe not found, skipping PKG creation."
-#} elseif (-not (Test-Path $pkgSrc)) {
-#    Write-Host "Orbis Postbuild: '$pkgSrc' not found, skipping PKG creation."
-#} else {
-    # All the PKG stuff goes here, i couldnt get it working consistently
-#}
\ No newline at end of file
+if (-not (Test-Path $genGp4)) {
+    Write-Host "Orbis Postbuild: gengp4_app.exe not found, skipping PKG creation."
+} elseif (-not (Test-Path $pkgSrc)) {
+    Write-Host "Orbis Postbuild: '$pkgSrc' not found, skipping PKG creation."
+} else {
+    Write-Host "Orbis Postbuild: Generating GP4..."
+    & $genGp4 $pkgSrc
+
+    if (-not (Test-Path $gp4File)) {
+        Write-Host "Orbis Postbuild ERROR: $gp4File was not created"
+        return
+    }
+
+    Write-Host "Orbis Postbuild: Patching GP4 default_id..."
+    (Get-Content $gp4File) -replace 'default_id="1"', 'default_id="0"' | Set-Content $gp4File
+
+    Write-Host "Orbis Postbuild: Building PKG..."
+    & $pubCmd img_create $gp4File $pkgPath
+
+    (Get-Content $gp4File) -replace 'default_id="1"', 'default_id="0"' | Set-Content $gp4File # str1k3r - ran again so we can open the GP4 file without it throwing a error.
+
+    Write-Host "Orbis Postbuild: PKG created at $pkgPath"
+}
\ No newline at end of file
diff --git a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1 b/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1
index 02131268..aeabac4d 100644
--- a/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1
+++ b/Minecraft.Client/Common/Postbuilds/PSVita-postbuild.ps1
@@ -104,8 +104,7 @@ foreach ($dir in $delDirs) {
 }
 
 # Make PSVita VPK
-$repoRoot = Split-Path ($ProjectDir.TrimEnd('\', '/')) -Parent
-$vpkPath  = Join-Path $repoRoot "Minecraft.Client.vpk"
+$vpkPath  = Join-Path $OutDir "Minecraft.Client.vpk"
 $vpkSrc   = Join-Path $OutDir "PSVITA_GAME"
 $sevenZip = "C:\Program Files\7-Zip\7z.exe"