diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..a3657fe
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,3 @@
+test-data/
+.git/
+.gitignore
diff --git a/Dockerfile b/Dockerfile
index a327a52..c6014e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,8 +3,8 @@ FROM alpine AS builder
 
 # Get the target platform
 ARG TARGETPLATFORM
-ENV HAYABUSA_VERSION=2.17.0
-ENV TAKAJO_VERSION=2.6.0
+ENV HAYABUSA_VERSION=3.8.1
+ENV TAKAJO_VERSION=2.15.1
 
 # Install necessary tools
 RUN apk add --no-cache unzip wget git
@@ -13,13 +13,13 @@ RUN apk add --no-cache unzip wget git
 RUN \
     case "$TARGETPLATFORM" in \
     "linux/amd64") \
-        HAYABUSA_ZIP="hayabusa-${HAYABUSA_VERSION}-linux-intel.zip"; \
+        HAYABUSA_ZIP="hayabusa-${HAYABUSA_VERSION}-lin-x64-gnu.zip"; \
         HAYABUSA_BINARY="hayabusa-${HAYABUSA_VERSION}-lin-x64-gnu"; \
-        TAKAJO_ZIP="takajo-${TAKAJO_VERSION}-linux-intel.zip"; \
+        TAKAJO_ZIP="takajo-${TAKAJO_VERSION}-lin-x64-gnu.zip"; \
         TAKAJO_BINARY="takajo-${TAKAJO_VERSION}-lin-x64-gnu"; \
         ;; \
     "linux/arm64") \
-        HAYABUSA_ZIP="hayabusa-${HAYABUSA_VERSION}-linux-arm.zip"; \
+        HAYABUSA_ZIP="hayabusa-${HAYABUSA_VERSION}-lin-aarch64-gnu.zip"; \
         HAYABUSA_BINARY="hayabusa-${HAYABUSA_VERSION}-lin-aarch64-gnu"; \
         ;; \
     *) echo "Unsupported platform: $TARGETPLATFORM"; exit 1 ;; \
diff --git a/start.sh b/start.sh
index b1c171c..3bffd1e 100644
--- a/start.sh
+++ b/start.sh
@@ -38,7 +38,7 @@ echo "Output is going to: ${output}"
 
 # Check if takajo exists before running it
 if [ -x /opt/hayabusa/takajo ]; then
-    /opt/hayabusa/takajo automagic -t "${output}_takajo.jsonl" -o "${outdir}/takajo"
+    ( cd /opt/hayabusa && ./takajo automagic -t "${output}_takajo.jsonl" -o "${outdir}/takajo" )
 else
     echo "[!] Takajo is not available on this platform."
 fi
\ No newline at end of file