diff --git a/bridgehead b/bridgehead
index a0ea5e8..c0b63b4 100755
--- a/bridgehead
+++ b/bridgehead
@@ -180,9 +180,8 @@ case "$ACTION" in
 		loadVars
 		log "WARNING" "Your are about to send a file to another bridgehead in your network!"
 		read -p "Please name the bridgehead you want to send the file to (proxy-id): " RECEIVER_PROXY_ID
-		read -p "Please type the path to the file you want to upload: " FILE_TO_SEND_PATH
         read -p "Continue? (Y/N): " confirm && [[ $confirm == [yY] || $confirm == [yY][eE][sS] ]] || exit 1
-		curl -X POST -F "data=@$FILE_TO_SEND_PATH" -u ":${BEAM_FILE_API_KEY}" http://localhost:8085/send/$RECEIVER_PROXY_ID
+		exec $COMPOSE -f ./modules/beam-file-compose.yml --profile beam-file-sender run beam-file-sender send --to beamfile.$1 /data/outfile
 		;;
 	*)
 		printUsage
diff --git a/modules/beam-file-compose.yml b/modules/beam-file-compose.yml
index 8ee0e4a..bc97f2e 100644
--- a/modules/beam-file-compose.yml
+++ b/modules/beam-file-compose.yml
@@ -12,7 +12,8 @@ services:
     # Only uncomment if your are sure what to do
     # ports:
     #   - 8085:8085
-    command: ["send", "--to", "beamfile"]
+    volumes:
+      - /var/cache/bridgehead/beam-file-out/:/data
     profiles: ["beam-file-sender"]
 
   beam-file-receiver:
diff --git a/modules/beam-file-setup.sh b/modules/beam-file-setup.sh
index ddf5093..fb5e3ca 100644
--- a/modules/beam-file-setup.sh
+++ b/modules/beam-file-setup.sh
@@ -1,14 +1,7 @@
 #!/bin/bash -e
 
 function beamFileSetup() {
-    if [ -n "$ENABLE_BEAM_FILE_SENDER" ]; then
-       echo "Starting beam file in sender mode"
-       OVERRIDE+=" -f ./modules/beam-file-compose.yml --profile beam-file-sender"
-       BEAM_FILE_SECRET="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
-       # NOTE: We could make this persistent across restarts
-       BEAM_FILE_API_KEY="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"
-       log INFO "Beam File in Sender Mode available uses ApiKey ${BEAM_FILE_API_KEY}"
-    elif [ -n "$ENABLE_BEAM_FILE_RECEIVER" ]; then
+    if [ -n "$ENABLE_BEAM_FILE_RECEIVER" ]; then
        echo "Starting beam file in receiver mode"
        OVERRIDE+=" -f ./modules/beam-file-compose.yml --profile beam-file-receiver"
        BEAM_FILE_SECRET="$(cat /proc/sys/kernel/random/uuid | sed 's/[-]//g' | head -c 20)"