diff --git a/Justfile b/Justfile
index 22605b1..1cae7fb 100644
--- a/Justfile
+++ b/Justfile
@@ -1,15 +1,28 @@
+just := just_executable()
+
 # Build the aurora-common container locally
 build:
     buildah build -t localhost/aurora-common:latest -f ./Containerfile .
 
+# Check the syntax of all Justfiles in the repository
 check:
     #!/usr/bin/bash
     find . -type f -name "*.just" | while read -r file; do
     	echo "Checking syntax: $file"
-    	just --unstable --fmt --check -f $file
+    	{{ just }} --unstable --fmt --check -f $file
+    done
+    echo "Checking syntax: Justfile"
+        {{ just }} --unstable --fmt --check -f Justfile
+
+# Fix the Just formatting
+ffix:
+    #!/usr/bin/bash
+    find . -type f -name "*.just" | while read -r file; do
+    	echo "Checking syntax: $file"
+    	{{ just }} --unstable --fmt -f $file
     done
     echo "Checking syntax: Justfile"
-    just --unstable --fmt --check -f Justfile
+    {{ just }} --unstable --fmt -f Justfile || { exit 1; }
 
 # Inspect the directory structure of an OCI image
 tree IMAGE="localhost/aurora-common:latest":