diff --git a/deploy/live-usb/config/hooks/live/0100-install-soosef.hook.chroot b/deploy/live-usb/config/hooks/live/0100-install-fieldwitness.hook.chroot
similarity index 100%
rename from deploy/live-usb/config/hooks/live/0100-install-soosef.hook.chroot
rename to deploy/live-usb/config/hooks/live/0100-install-fieldwitness.hook.chroot
diff --git a/deploy/live-usb/config/hooks/live/0200-harden.hook.chroot b/deploy/live-usb/config/hooks/live/0200-harden.hook.chroot
index 49b928c..39b23fa 100755
--- a/deploy/live-usb/config/hooks/live/0200-harden.hook.chroot
+++ b/deploy/live-usb/config/hooks/live/0200-harden.hook.chroot
@@ -26,7 +26,7 @@ systemctl disable avahi-daemon.service 2>/dev/null || true
 systemctl disable cups.service 2>/dev/null || true
 
 # Enable FieldWitness service
-systemctl enable soosef.service
+systemctl enable fieldwitness.service
 
 # Auto-login to openbox (so the browser opens without login prompt)
 mkdir -p /etc/lightdm/lightdm.conf.d
diff --git a/deploy/live-usb/config/includes.chroot/etc/systemd/system/soosef.service b/deploy/live-usb/config/includes.chroot/etc/systemd/system/fieldwitness.service
similarity index 100%
rename from deploy/live-usb/config/includes.chroot/etc/systemd/system/soosef.service
rename to deploy/live-usb/config/includes.chroot/etc/systemd/system/fieldwitness.service
diff --git a/deploy/live-usb/config/package-lists/soosef.list.chroot b/deploy/live-usb/config/package-lists/fieldwitness.list.chroot
similarity index 100%
rename from deploy/live-usb/config/package-lists/soosef.list.chroot
rename to deploy/live-usb/config/package-lists/fieldwitness.list.chroot
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index bf3c3e6..6228d58 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,8 +1,8 @@
 services:
   fieldwitness:
     build:
-      context: ../..   # Sources/ directory (contains stego/, attest/, fieldwitness/)
-      dockerfile: fieldwitness/docker/Dockerfile
+      context: ..      # Project root directory
+      dockerfile: docker/Dockerfile
     container_name: fieldwitness
     ports:
       - "35811:35811"