diff --git a/apps/atoods/values-tucson-teststand.yaml b/apps/atoods/values-tucson-teststand.yaml
index 7ca384f0..325a1060 100644
--- a/apps/atoods/values-tucson-teststand.yaml
+++ b/apps/atoods/values-tucson-teststand.yaml
@@ -37,25 +37,31 @@ configfile:
         minutes: 0
         seconds: 0
 
+    ingesterClass:
+        ingesterType: lsst.ctrl.oods.fileIngester
+        ingesterName : FileIngester
+
     ingester:
         imageStagingDirectory: /data/staging/auxtel/oods
         butlers:
             - butler:
-                instrument: lsst.obs.lsst.Latiss
                 class:
-                    import : lsst.ctrl.oods.gen3ButlerIngester
-                    name : Gen3ButlerIngester
+                    import: lsst.ctrl.oods.fileAttendant
+                    name : FileAttendant
+                instrument: lsst.obs.lsst.Latiss
                 stagingDirectory : /data/lsstdata/TTS/auxtel/oods/gen3butler/raw
                 badFileDirectory: /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles
                 repoDirectory : /repo/LATISS
                 collections:
                     - LATISS/raw/all
+                cleanCollections:
+                    - collection: LATISS/raw/all
+                      filesOlderThan:
+                          <<: *interval
+                          days: 30
                 scanInterval:
                     <<: *interval
                     hours: 1
-                filesOlderThan:
-                    <<: *interval
-                    days: 30
         batchSize: 20
         scanInterval:
             <<: *interval
@@ -69,7 +75,7 @@ configfile:
         clearEmptyDirectoriesAndOldFiles:
             - /data/lsstdata/TTS/auxtel/oods/gen3butler/badfiles
             - /data/staging/auxtel/oods
-            - /data/staging/auxtel/forwarder
+            - /data/staging/auxtel/camera
         scanInterval:
             <<: *interval
             hours: 1
diff --git a/apps/ccoods/values-tucson-teststand.yaml b/apps/ccoods/values-tucson-teststand.yaml
index a908ed01..60e78843 100644
--- a/apps/ccoods/values-tucson-teststand.yaml
+++ b/apps/ccoods/values-tucson-teststand.yaml
@@ -37,25 +37,31 @@ configfile:
         minutes: 0
         seconds: 0
 
+    ingesterClass:
+        ingesterType: lsst.ctrl.oods.fileIngester
+        ingesterName : FileIngester
+
     ingester:
         imageStagingDirectory: /data/staging/comcam/oods
         butlers:
             - butler:
-                instrument: lsst.obs.lsst.LsstComCam
                 class:
-                    import : lsst.ctrl.oods.gen3ButlerIngester
-                    name : Gen3ButlerIngester
+                    import : lsst.ctrl.oods.fileAttendant
+                    name : FileAttendant
+                instrument: lsst.obs.lsst.LsstComCam
                 stagingDirectory : /data/lsstdata/TTS/comcam/oods/gen3butler/raw
                 badFileDirectory: /data/lsstdata/TTS/comcam/oods/gen3butler/badfiles
                 repoDirectory : /repo/LSSTComCam
                 collections:
                     - LSSTComCam/raw/all
+                cleanCollections:
+                    - collection: LSSTComCam/raw/all
+                      filesOlderThan:
+                          <<: *interval
+                          days: 30
                 scanInterval:
                     <<: *interval
                     hours: 1
-                filesOlderThan:
-                    <<: *interval
-                    days: 30
         batchSize: 20
         scanInterval:
             <<: *interval
@@ -69,7 +75,7 @@ configfile:
         clearEmptyDirectoriesAndOldFiles:
             - /data/lsstdata/TTS/comcam/oods/gen3butler/badfiles
             - /data/staging/comcam/oods
-            - /data/staging/comcam/forwarder
+            - /data/staging/comcam/camera
         scanInterval:
             <<: *interval
             hours: 1