diff --git a/tile_gen/run.sh b/tile_gen/run.sh
index 7501bea2c61206b36cd6fc710e237427b5054253..fa27094e81f658b0ec5a7f6545dd0bce482c5ce6 100755
--- a/tile_gen/run.sh
+++ b/tile_gen/run.sh
@@ -17,7 +17,7 @@ test -d "/data"
 
 export AMQPFIND_ARGS=${AMQPFIND_ARGS:-"-H cspp-geo-rabbit -X satellite -u guest -p guest"}
 export AMQPSEND_ARGS=${AMQPSEND_ARGS:-"-D 15 -H cspp-geo-rabbit -X satellite -u guest -p guest"}
-export AMQPFIND_TOPIC=${AMQPFIND_TOPIC:-'data.goes.*.abi.*.l1b.geotiff.complete'}
+export AMQPFIND_TOPIC=${AMQPFIND_TOPIC:-'data.goes.*.abi.*.l1b.geotiff.all.complete'}
 export G2G_PRODUCTS=${G2G_PRODUCTS:-"C01 C02 C03 C04 C05 C06 C07 C08 C09 C10 C11 C12 C13 C14 C15 C16 true_color"}
 export TILE_ARGS=${TILE_ARGS:-""}
 export TMPDIR=${TMPDIR:-"/dst/tmp"}
@@ -69,7 +69,7 @@ run_tile_gen() {
         # Remove the /data prefix
         glob_pattern="${glob_pattern/${dst_dir}\//}"
 
-        amqpsend_topic="data.${satellite_family}.${satellite_id}.${instrument}.${data_type}.l1b.tiles.${product}.complete"
+        amqpsend_topic="data.${satellite_family}.${satellite_id}.${instrument}.${data_type}.l1b.tiles.${product,,}.complete"
         json_info="{\"path\": \"${glob_pattern}\", \"satellite_family\": \"${satellite_family}\", \"satellite_ID\": \"${satellite_id}\", \"instrument\": \"${instrument}\", \"data_type\": \"${data_type}\", \"product\": \"${product}\"}"
         # append the JSON returned by the python (remove the curly braces at the ends)
         json_info="${json_info:0:-1}, ${json_times_changed:1}"