diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index deb2a10..4e851ae 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -62,6 +62,7 @@
 	// Comment out to connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	"remoteUser": "vscode",
 	"features": {
-		"java": "11"
+		"java": "11",
+		"gradle": "latest"
 	}
 }
diff --git a/.devcontainer/post-create.sh b/.devcontainer/post-create.sh
index 8b88e36..d4a3fb0 100755
--- a/.devcontainer/post-create.sh
+++ b/.devcontainer/post-create.sh
@@ -24,4 +24,9 @@ pip install ghidra_bridge
 python -m ghidra_bridge.install_server .ghidra_bridge
 
 # Install pyhdira
-pip install pyhidra
\ No newline at end of file
+pip install pyhidra
+
+# If arm64 os, need to build native binaries for Ghidra
+if uname -a | grep -q 'aarch64'; then
+    $GHIDRA_INSTALL_DIR/support/buildNatives
+fi
\ No newline at end of file