diff --git a/terraform/stacks/unimelb/data_archive/fastq_archive.tf b/terraform/stacks/unimelb/data_archive/fastq_archive.tf
index a85110d8..84d3997a 100644
--- a/terraform/stacks/unimelb/data_archive/fastq_archive.tf
+++ b/terraform/stacks/unimelb/data_archive/fastq_archive.tf
@@ -31,6 +31,14 @@ resource "aws_s3_bucket_server_side_encryption_configuration" "fastq_archive" {
   }
 }
 
+resource "aws_s3_bucket_versioning" "fastq_archive" {
+  bucket = aws_s3_bucket.fastq_archive.id
+
+  versioning_configuration {
+    status = "Enabled"
+  }
+}
+
 resource "aws_s3_bucket_lifecycle_configuration" "fastq_archive" {
 
   bucket = aws_s3_bucket.fastq_archive.bucket
@@ -38,6 +46,14 @@ resource "aws_s3_bucket_lifecycle_configuration" "fastq_archive" {
   rule {
     id = "base_rule"
     status = "Enabled"
+    expiration {
+      expired_object_delete_marker = true
+    }
+    noncurrent_version_expiration {
+      # Lowest storage tier is currently: GLACIER_IR
+      # It's charged for a min of 90 days (DEEP_ARCHIVE = 180 days)
+      noncurrent_days = 85
+    }
     abort_incomplete_multipart_upload {
       days_after_initiation = 7
     }
@@ -74,36 +90,96 @@ resource "aws_s3_bucket_policy" "fastq_archive" {
 }
 
 data "aws_iam_policy_document" "fastq_archive" {
-  # Statement to allow uploads from a dedicated role in the dev account
+  # Statement to allow FileManager access
   statement {
-	  sid = "AllowUploadFromDevInstanceRole"
+    sid = "orcabus_file_manager_access"
     principals {
       type        = "AWS"
-      identifiers = ["arn:aws:iam::843407916570:role/EC2-to-S3"]
+      identifiers = ["arn:aws:iam::${local.account_id_prod}:role/${local.orcabus_file_manager_ingest_role}"]
     }
     actions = [
-      "s3:List*",
+      "s3:ListBucket",
       "s3:GetObject",
-      "s3:DeleteObject",
-      "s3:PutObject"
+      # Note, filemanager is not using GetObjectAttributes yet.
+      "s3:GetObjectAttributes",
+      "s3:GetObjectVersionAttributes",
+      "s3:GetObjectVersion",
+      "s3:GetObjectTagging",
+      "s3:GetObjectVersionTagging",
+      "s3:PutObjectTagging",
+      "s3:PutObjectVersionTagging"
+    ]
+    resources = [
+      aws_s3_bucket.fastq_archive.arn,
+      "${aws_s3_bucket.fastq_archive.arn}/*"
+    ]
+  }
+  # Statement to allow access to any principal from the prod account
+  statement {
+	  sid = "umccr_prod_account_access"
+    principals {
+      type        = "AWS"
+      identifiers = ["472057503814"]
+    }
+    actions = [
+      "s3:List*"
     ]
     resources = [
       aws_s3_bucket.fastq_archive.arn,
-      "${aws_s3_bucket.fastq_archive.arn}/*",
+      "${aws_s3_bucket.fastq_archive.arn}/*"
     ]
   }
-  # # Statement to allow access to any principal from the dev account
-  # statement {
-	#   sid = "prod_list_access"
-  #   principals {
-  #     type        = "AWS"
-  #     identifiers = ["472057503814"]
-  #   }
-  #   actions = [
-  #     "s3:List*"
-  #   ]
-  #   resources = [
-  #     aws_s3_bucket.fastq_archive.arn,
-  #   ]
-  # }
+}
+
+# ------------------------------------------------------------------------------
+# EventBridge rule to forward events from to the target account
+
+resource "aws_s3_bucket_notification" "fastq_archive" {
+  bucket      = aws_s3_bucket.fastq_archive.id
+  eventbridge = true
+}
+
+data "aws_iam_policy_document" "put_fastq_events_to_prod_bus" {
+  statement {
+    effect    = "Allow"
+    actions   = ["events:PutEvents"]
+    resources = [local.event_bus_arn_umccr_prod_default]
+  }
+}
+
+resource "aws_iam_policy" "put_fastq_events_to_prod_bus" {
+  name   = "put_fastq_events_to_prod_bus"
+  policy = data.aws_iam_policy_document.put_fastq_events_to_prod_bus.json
+}
+
+resource "aws_iam_role" "put_fastq_events_to_prod_bus" {
+  name               = "put_fastq_events_to_prod_bus"
+  assume_role_policy = data.aws_iam_policy_document.eventbridge_assume_role.json
+}
+
+resource "aws_iam_role_policy_attachment" "put_fastq_events_to_prod_bus" {
+  role       = aws_iam_role.put_fastq_events_to_prod_bus.name
+  policy_arn = aws_iam_policy.put_fastq_events_to_prod_bus.arn
+}
+
+# TODO: could restrict the events (detail-type) further to avoid unnecessary cost
+resource "aws_cloudwatch_event_rule" "put_fastq_events_to_prod_bus" {
+  name        = "put_fastq_events_to_prod_bus"
+  description = "Forward S3 events from prod fastq archive bucket to prod event bus"
+  event_pattern = jsonencode({
+    source  = ["aws.s3"],
+    account = [data.aws_caller_identity.current.account_id],
+    detail = {
+      bucket = {
+        name = [aws_s3_bucket.fastq_archive.id]
+      }
+    }
+  })
+}
+
+resource "aws_cloudwatch_event_target" "put_fastq_events_to_prod_bus" {
+  target_id = "put_fastq_events_to_prod_bus"
+  arn       = local.event_bus_arn_umccr_prod_default
+  rule      = aws_cloudwatch_event_rule.put_fastq_events_to_prod_bus.name
+  role_arn  = aws_iam_role.put_fastq_events_to_prod_bus.arn
 }