diff --git a/cleanup/cleanup.py b/cleanup/cleanup.py
index e792893..a17fe6a 100644
--- a/cleanup/cleanup.py
+++ b/cleanup/cleanup.py
@@ -9,9 +9,16 @@
 
 # prefix for the queue names
 RABBITMQ_QUEUE_PREFIX = os.getenv("PREFIX", "")
-INPUT_QUEUE = f"{RABBITMQ_QUEUE_PREFIX}cleanup"
+# add way to autodectect .error queues - upload.error queue
+INPUT_QUEUES = [
+    '{RABBITMQ_QUEUE_PREFIX}download.error',
+    '{RABBITMQ_QUEUE_PREFIX}cdrhook.error',
+    '{RABBITMQ_QUEUE_PREFIX}upload.error',
+    '{RABBITMQ_QUEUE_PREFIX}golden_muscat.error',
+    '{RABBITMQ_QUEUE_PREFIX}icy_resin.error'
+]
 ERROR_QUEUE = f"{RABBITMQ_QUEUE_PREFIX}cleanup.error"
-OUTPUT_QUEUE = f"{RABBITMQ_QUEUE_PREFIX}finished"
+OUTPUT_QUEUE = f"{RABBITMQ_QUEUE_PREFIX}completed"
 
 def parse_command_line():
     import argparse
@@ -20,6 +27,40 @@ def parse_command_line():
     parser.add_argument('--output-dir', type=str, default='/output', help='Directory where the output is stored')
     return parser.parse_args()
 
+def cleanup_callback(channel, method, properties, body):
+    data = json.loads(body)
+    image_path = os.path.join(args.data_dir, data['image_filename'])
+    cdr_json_path = os.path.join(args.data_dir, data['json_filename'])
+    uiuc_json_path = os.path.join(args.output_dir, data['cdr_output'])
+    map_name = os.path.splitext(os.path.basename(image_path))[0]
+    logging.debug(f'Cleaning up - {map_name}')
+
+    # Delete files
+    try:
+        os.remove(image_path)
+        os.remove(cdr_json_path)
+        os.remove(uiuc_json_path)
+    except Exception as e:
+        # Send to error queue
+        logging.error(f'Error deleting files for map {map_name}: {e}')
+
+        channel.basic_publish(exchange='', routing_key=ERROR_QUEUE, body=body, properties=properties)
+        channel.basic_ack(delivery_tag=method.delivery_tag)
+    
+    # Send to output queue
+    channel.basic_publish(exchange='', routing_key=OUTPUT_QUEUE, body=body, properties=properties)
+    channel.basic_ack(delivery_tag=method.delivery_tag)
+
+def upload_error_callback(channel, method, properties, body):
+    data = json.loads(body)
+    image_path = os.path.join(args.data_dir, data['image_filename'])
+    map_name = os.path.splitext(os.path.basename(image_path))[0]
+    logging.debug(f'Sending {map_name} from upload.error back to upload queue to retry')
+
+    # Send back to upload queue to retry
+    channel.basic_publish(exchange='', routing_key=f'{RABBITMQ_QUEUE_PREFIX}upload', body=body, properties=properties)
+    channel.basic_ack(delivery_tag=method.delivery_tag)
+
 def main(args):
     # connect to rabbitmq
     logging.info('Connecting to RabbitMQ server')
@@ -28,7 +69,8 @@ def main(args):
     channel = connection.channel()
 
     # create queues
-    channel.queue_declare(queue=INPUT_QUEUE, durable=True)
+    for input in [INPUT_QUEUES]:
+        channel.queue_declare(queue=input, durable=True)
     channel.queue_declare(queue=ERROR_QUEUE, durable=True)
     channel.queue_declare(queue=OUTPUT_QUEUE, durable=True)
 
@@ -36,43 +78,10 @@ def main(args):
     channel.basic_qos(prefetch_count=1)
 
     # create generator to fetch messages
-    consumer = channel.consume(queue=INPUT_QUEUE, inactivity_timeout=1)
-
-    # loop getting new messages
-    running = True
-    while running:
-        activity = False
-        # Take next message from the queue
-        method, properties, body = next(consumer)
-
-        if method is not None:
-            activity = True
-            data = json.loads(body)
-            image_path = os.path.join(args.data_dir, data['image_filename'])
-            cdr_json_path = os.path.join(args.data_dir, data['json_filename'])
-            uiuc_json_path = os.path.join(args.output_dir, data['cdr_output'])
-            map_name = os.path.splitext(os.path.basename(image_path))[0]
-            logging.debug(f'Cleaning up - {map_name}')
-
-            # Delete files
-            try:
-                os.remove(image_path)
-                os.remove(cdr_json_path)
-                os.remove(uiuc_json_path)
-            except Exception as e:
-                # Send to error queue
-                logging.error(f'Error deleting files for map {map_name}: {e}')
-
-                channel.basic_publish(exchange='', routing_key=ERROR_QUEUE, body=body, properties=properties)
-                channel.basic_ack(delivery_tag=method.delivery_tag)
-            
-            # Send to output queue
-            channel.basic_publish(exchange='', routing_key=OUTPUT_QUEUE, body=body, properties=properties)
-            channel.basic_ack(delivery_tag=method.delivery_tag)
-
-        if not activity:
-            sleep(0.5)             
-        
+    for queue in INPUT_QUEUES:
+        channel.basic_consume(queue=queue, on_message_callback=cleanup_callback, inactivity_timeout=1)
+    
+    # channel.basic_consume(queue=f'{RABBITMQ_QUEUE_PREFIX}upload.error', on_message_callback=upload_error_callback, inactivity_timeout=1)
 
 if __name__ == '__main__':
     logging.basicConfig(format='%(asctime)-15s [%(threadName)-15s] %(levelname)-7s :'