diff --git a/clusters/staging/management/apps.yaml b/clusters/staging/management/apps.yaml
index 4c54f4a..66184a8 100644
--- a/clusters/staging/management/apps.yaml
+++ b/clusters/staging/management/apps.yaml
@@ -10,7 +10,7 @@ spec:
   project: default
   source:
     repoURL: https://github.com/stfc/cloud-deployed-apps.git
-    targetRevision: folder_flows
+    targetRevision: main
     path: clusters/staging/management
   syncPolicy:
     automated:
@@ -62,7 +62,7 @@ spec:
       project: default
       source:
         repoURL: "https://github.com/stfc/cloud-deployed-apps.git"
-        targetRevision: folder_flows
+        targetRevision: main
         path: "charts/staging/{{chartName}}"
         helm:
           valueFiles:
@@ -89,7 +89,7 @@ spec:
   generators:
     - git:
         repoURL: "https://github.com/stfc/cloud-deployed-apps.git"
-        revision: folder_flows
+        revision: main
         files:
           # grab all infra values for all clusters in environment
           - path: "clusters/staging/*/infra-values.yaml"
@@ -98,7 +98,7 @@ spec:
 
   template:
     metadata:
-      name: "{{path.basename}}-cluster"
+      name: "staging-{{path.basename}}-cluster"
       # All applications need to go into the ArgoCD namespace
       namespace: argocd
     spec:
@@ -108,7 +108,7 @@ spec:
         server: https://kubernetes.default.svc
       source:
         repoURL: https://github.com/stfc/cloud-deployed-apps.git
-        targetRevision: folder_flows
+        targetRevision: main
         path: charts/staging/capi-infra
         helm:
           releaseName: "{{path.basename}}"
diff --git a/secrets/staging/management/api-server-fip.yaml b/secrets/staging/management/api-server-fip.yaml
index 1857af2..51dc553 100644
--- a/secrets/staging/management/api-server-fip.yaml
+++ b/secrets/staging/management/api-server-fip.yaml
@@ -1,6 +1,6 @@
 openstack-cluster:
     apiServer:
-        floatingIP: ENC[AES256_GCM,data:sTpePYb3oLjBWTWI30Sq,iv:GU5IfrreY5q3WhZ/0tC6Yy9Dm60yS0P35HoXcd19cGc=,tag:zo1VMlROeGwGsW395gdrGg==,type:str]
+        floatingIP: ENC[AES256_GCM,data:DYCWrz1IBc9X5sz7vQ==,iv:a/0GVpMJjoojO4UxUF5bK7CZrgLWk9P9NKXBr42uKO8=,tag:SZVhPLhw463UJisKNdSR8g==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -10,23 +10,23 @@ sops:
         - recipient: age1hsll27prywydttq7dtnqtdnu2jpr8zhaulx00l7n4pqmxkhr55vspqmj6l
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBR1U3TVBMdVpqR1FvMHo1
-            UWxVQk1LUjhkc2VwVFNrSDU1NWNzWDRnd3c0CnIzVlZobkFDVmpRcnFKeU9RR2dj
-            N1R6SjJtZWY5RU1xYllCVGRFYUtuUUkKLS0tIEExdW82L05rQVAzYXM4YTVrRjZC
-            RXIxM1IxV2tVOFRlVGlzVjJqOHZiLzgKkdgSs1lTxThlmjVRD5EUY4zEhy4qxDX2
-            9nW3fhwcZE52Mabjun07xGq7H9AbFhJvy/WI3t+0e8bTGKr+m56K/Q==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQdVJMMlZoZFdvek5OaTNs
+            bDR1VWpGalZBdEdPc3BFK0dpTGRQY0c5a1MwCkIxSWhyNEU2enNXWENhbjlITVY1
+            NHRQNlNKQ1diMnVkMTBENjl1cjAzV2sKLS0tIFNEWWZ0Vy9vb0pnWGphN3FXZHBk
+            ZGxwSnVrNU1XRFN4VkRMSjI4U3FEZGMKb3dlPjSn0blbXvp4i22sqi1CW8I7s9fb
+            z0/YHPaM4aKEvnm+8flIFFDaQ6y7uD1I0+edkGoE1dAAl73S7zAMjA==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1cx49ss4m25nzm8ju80g2jmpwdj72fvyllzqj6nh3lx3jdmgqnfss80z4xs
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBrcHorTFZiT083TkJESndI
-            ZFlzNDQvb1dHRDNpZkUyM1JjQ0gyTC95K3hrCmw1VDF6N3c2V2wwUGdOSHJzN21X
-            L3o3UXd3aHFCSzJaSmFobXZocjVXdkEKLS0tIFFSdWlnR3h5eHZOem9tTzQ0d1VC
-            NWZFc09VMldRbVhvdXU5ZVlST2F6aDQKPqRjvdjkiuKWJR6acX0kWwnV3gq3EyOI
-            O5rGi5bsHmB4Z5JZUYeACvfG22vy1H0YKdN4zTztM0AB2cY4w63FRA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA3elBhSE9FZzBsWjM3Z1Bq
+            Sk1nMlovN2NlR3JtMzBub0pwUDk3Rk1hMTNFCk55VzFtQytiUzVHN1dNTDUvVCs5
+            S0x4NXR1V3hLRmNFN0tVU1c0SnluS0EKLS0tIFRER2xLc0lkYWxmSFBUS0NGMGQ4
+            OVBhU09lRUNYeFNyUUFMSWdxaXZrMnMKg1Hqgkyyfzqe1Qv3el6nM+1umqj/Z3QK
+            3hOaleUN1mDawONsvFYLV1m1FFAaLjPXfZGyGdc2o9GhrYsO/TC06w==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-11T14:29:06Z"
-    mac: ENC[AES256_GCM,data:nPEaVMWEjWRSDnGfS7rz/7jLHQymH6Xt5qo9AKfjreYP4PRN84H1B3yM781pOq9xqvwPQzrxj2CKNul6Y0AqV0teDpmAq02OXp42eTNSVk5KlLcOlvfJvol0VZECEAzsykG+zLZ9xnm5RIQfeIpcqr1YTAmjaL4NyPQzxNq7He0=,iv:QGgzCtpHbjybhLtLketwDrDgJoK+YkKBAFNdJ1SXHiA=,tag:TmTp6PfsykVYGQF09a3Rug==,type:str]
+    lastmodified: "2024-06-20T13:25:58Z"
+    mac: ENC[AES256_GCM,data:+MkYqlG48YdOubUx9YnttfvxjBunQlK2sP2Og6kO0iTo7Ug5thpjE4D+bPHL+Xxh9rJVbaltuDpj3j1mXsuqFbwZNDgQzgH0rJGbjdChRykP7Tm7sLn/koFenYQ8pW1AaCo5DMVb6vG+dIoGtDGd7nraLZ7EEm1MLu/LbYHGCzo=,iv:gOM2iqAmfuu0lhto+84KpZJVz1Xf6T6sTVqQfyuFco8=,tag:VtxanxZpNYvYihXBSmk1dA==,type:str]
     pgp: []
     unencrypted_regex: ^(apiVersion|metadata|kind|type)$
     version: 3.8.1
diff --git a/secrets/staging/management/app-creds.yaml b/secrets/staging/management/app-creds.yaml
index dffc5f3..ea37241 100644
--- a/secrets/staging/management/app-creds.yaml
+++ b/secrets/staging/management/app-creds.yaml
@@ -1,15 +1,15 @@
 openstack_cluster:
-    clouds:
-        openstack:
-            auth:
-                auth_url: ENC[AES256_GCM,data:0OGGaYKygiELCvP5of88tmZVJcx6cPWdmPoyl98C0BfQxKC5,iv:r6iFHHVqGp3BotLAvg14uSv6z9OuYc73SQ3SLlhkIKQ=,tag:UhDVUzY+eq2hR6I42xrUOQ==,type:str]
-                application_credential_id: ENC[AES256_GCM,data:OrzClfw1gPIvWa/+BCV3QWTMrU3mtDZ9M7ENrADYtII=,iv:45v86fKTTv5KTudjN4P6nF63/J1zJxP46UQ97cRPWgI=,tag:HJfTf9N/PfrjekxsRusSGQ==,type:str]
-                application_credential_secret: ENC[AES256_GCM,data:nVAyMQd6x1UARe41SIUFzgrhKzJGvNmAhLl6DwY7ID/QrTUjuVs0ZOqkLA01l2i2VitizF0s4kLPrWKjxvdVg9N1zdISTj5YGXtWR5JDwoaoDzsQVOM=,iv:K03dCMyj2Y3LOvR7ybEobXpu1gbVKfudueN1If5TXFU=,tag:YoO74F+gLqBOUcbzIUdsUA==,type:str]
-                project_id: ENC[AES256_GCM,data:h7q/I6jyFtgHtUbTJzpZHSatioa0wMCnIlbop/Fn0bQ=,iv:JGkcDU+swFNb5tWr0YifhHSnxxHKHjU+wrmVbLkIUUo=,tag:hdI+1Dc5GfTeXi3ICMraGg==,type:str]
-            region_name: ENC[AES256_GCM,data:/1ukBSZUbkGw,iv:YRv882e2bjZcolbO7181/MNp/Gor/7d0ej0kSV25ZxI=,tag:jJha0eZvvjNGR9EWMJX4SQ==,type:str]
-            interface: ENC[AES256_GCM,data:BbAkqAl2,iv:C43Wn+6sc67DsuBQApNouzl8te0sN4Tej58hv/46IYk=,tag:Y7xQZ10jOY0bHUV1Kx+T8w==,type:str]
-            identity_api_version: ENC[AES256_GCM,data:6g==,iv:yLAVeDeTNEi135EgCH3u0y9MsOAiNGn07XV5b0HzLuA=,tag:MOvJQwEB8r+qbAhoy9ZNbQ==,type:int]
-            auth_type: ENC[AES256_GCM,data:VAEhPWNmMUZQMwK7ZnI3CD+Ta+qb2A4=,iv:fLvry0hPwhGQ5Ss62nwvmcKoFd8hGEbpjsQ38c0otqU=,tag:Sv8pPcZ8a8gGWfw7CNpLaw==,type:str]
+  clouds:
+    openstack:
+      auth:
+          auth_url: ENC[AES256_GCM,data:ieAsed0dImaFXDRUjkNMIMIbBt20RjqFMUTxIgpmV9O2,iv:vmw0NyIRMdF2WpekXeiqjdZ0qS7XAgwJUzEuRXVhScg=,tag:2lzcTGnj6xyTZ9qY6SPpfA==,type:str]
+          application_credential_id: ENC[AES256_GCM,data:XzIMedEeXL9bEQ39cKDhs/fCugqhfYu/+hl3pCUBdDA=,iv:jbP2SgPe+GGJEQwqTsG9UDKZqyXPcQBf1fT4wTpnRGo=,tag:CLL27I9/CUjO2CiC/bAbMg==,type:str]
+          application_credential_secret: ENC[AES256_GCM,data:3qDPoHsSVM+Q9xAostWEsZDUYiwkHLSpOf484Fy/n7V97FZQhF+ECDVuyggu8Z6aJdwhDLzjUiFp2PN0H1xWKxi/NJ3lmWJ3lqxRZRLxUtOd5q7i3lI=,iv:K5MBRlgVNIva8TnvoKpF1j0BSH8ho2AvMDyhIvTnlfk=,tag:Oq8Ang8VE0EclWakGYD/ew==,type:str]
+          project_id: ENC[AES256_GCM,data:IZR1HcEjNb7f/TNxEsVICsWZOMzoiB9rS2Oa8CBqAZQ=,iv:o/taYvy5LwK07wDvFb7HnkDfu/nZrL9IXhys6zgc5iE=,tag:lujLKxJ4g36jg0qK3W7urg==,type:str]
+      region_name: ENC[AES256_GCM,data:OqIHBmtoxv6A,iv:3p0g46yFa7W4di7VEcCTQ5aEZYczLIRwn+0b6JlfLjg=,tag:ZFFNgmoBqFYuk3JGIJMf7g==,type:str]
+      interface: ENC[AES256_GCM,data:dyDWayqA,iv:qS+Y0s0UPrIm4BFMbX98LvxMgfrKj/Z1yq4xuhGz6YU=,tag:UpTplu8VKtAksD4c2jnb9g==,type:str]
+      identity_api_version: ENC[AES256_GCM,data:YQ==,iv:T2EDdDMym+FQbEA3n2dTRkkFJonSRlFbIMWJrIRUDAc=,tag:DQ9Fprx7I5r+r3OTITiE8w==,type:int]
+      auth_type: ENC[AES256_GCM,data:YfY+ALXCuTnE2NNP1JL2kuYFPgrzI+M=,iv:0yrHoB78ZCsFzTGc4c5Drh0Je8WNlvADzgl/CZq4m5w=,tag:5csxvmjPwSF3b/W8dN9w2g==,type:str]
 sops:
     kms: []
     gcp_kms: []
@@ -19,23 +19,23 @@ sops:
         - recipient: age1hsll27prywydttq7dtnqtdnu2jpr8zhaulx00l7n4pqmxkhr55vspqmj6l
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwejNyZEJRYjA3RWo1M3p4
-            b3Y2TDVXcVp6Tm4wZmdDQUYySjByTzl4RVhzClNwMkl5cmZ0WGNFNDlWaXVrYzhz
-            Tk85ZGR3eE9SMmhTR2ZoTlVRb1JkQUEKLS0tIEU1d2lLR2NjemNiODh1cXRnMU81
-            NkFQOGhFSnF3MDdDazdiM204Vy9iMU0K5lEdYfjIwmhfWLofHvW9cadKVXX50Pw3
-            cPaDONRhKppWhaIdNi/tS9HpQLaLvtZxolyu0GYSie7RGFZ079OflQ==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBPckZPQkV2b29xekdxL0g3
+            cEJwUk1OSmEwekcyWTVFOGVZaFBEWE15VlJBCkkvcXBWRDRYbUdndFVIYVVjdjJW
+            TDJaVzZCM3RGZ2d5ZjdMazBCVDQrSGsKLS0tIGlvRUYxQkwrdU9MZUxZOU5pY29q
+            QWRaMUFHdE5EcHlPRjRMcE05L25LeTQKD4DpUniIHpfLER9UHr9mKEzczkRhNuZ1
+            7hK6M34umym7nsISYSvYMM9NMg0YfZngTLX2zY8PXBeJjKfUssG2MQ==
             -----END AGE ENCRYPTED FILE-----
         - recipient: age1cx49ss4m25nzm8ju80g2jmpwdj72fvyllzqj6nh3lx3jdmgqnfss80z4xs
           enc: |
             -----BEGIN AGE ENCRYPTED FILE-----
-            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBuZi9CcCt2dklKM0ZrRnNj
-            cFd1OUJMa2p5NjgxM21RaHFzcUJ1dEtZUG4wCm9aMW5BMXRNR25xWm52MDd4Nndi
-            T2Z1Q09qMVhzd09oeHlmSElJNXRsOVUKLS0tIFRmVkZYTmVOSm1HTFVwQTJpdWQ4
-            WC9LQzhkTWU0ZlYyUWo1TFlXek1wU1UKgJX45NBu1cWMKl2BLeARmKHOmYl/EUNl
-            GKhkCNi+eD5q/1lKJOD23CVMgHmvH2bTQ+k6EY3DlsQttv/XxFVGpA==
+            YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGcHI3bndTQjZucUEyOSs5
+            em05d2VZcnRoTUdBRHN1aU04L29jZGJtMWpjCllwcTVydGRBb2IrZUVuUnZhbktE
+            dnhNbUlObUxDVjd6UXJYTUxRR3VYbEkKLS0tIEpIRHM1ZjJRT3ZXVnI0dVVqeVdN
+            N1d6L29qeWJBZW1qMlhiRS9sK1BQdm8KHJxX2aXETv5HUsQpbnGZvq+/dX7Sn+vA
+            lxOpfkb9Ag1uEh0WtfZYOfZfHaEygeqvZaI9QX3jcwBcaXb09soGGg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-06-11T14:35:59Z"
-    mac: ENC[AES256_GCM,data:+ajsNBY6iDqZzp/46LnEHB414tBXq2eIn6HgflLiwQH/bWA+F1B187W/UYXU17/9bXnJeHsVWvjloqfLapKAt6vHhJtvfeOY/iNZEGKuaMz8yQi0yiKX3+BtA0Cr8aBNbCSbadKlLrvaliqVfOsYboCBzn/BYCedVeklX+njKtM=,iv:37INS7AVhE55IwVAKZZ16DJ0Od6H0NQlE+uWu1NAMM8=,tag:NFu6ofJAQ2u43GiI2WX7Iw==,type:str]
+    lastmodified: "2024-06-20T13:29:42Z"
+    mac: ENC[AES256_GCM,data:1/pv/YAtDCkElBIfusnPyr0ef5hiTCN2P6z+imUzFP3fOyA2GiEMlmLQ7CVffNhjP+3Orn/FGFBZ116zDHC0DqW8UUfcPXcg507HM+ehXCR2/f5frV3igN5GlYDO8OAdUTBxOJwbAC7wHubWgs1XqSQ5p+qS2W2R1NqpS2gRwGs=,iv:nYNmjN/mpOY8SCHqKf1NPT0bz/TNZ7qZmCoXYIIIuvc=,tag:ocAWEcyNBnnl5+LVqNGVpg==,type:str]
     pgp: []
     unencrypted_regex: ^(apiVersion|metadata|kind|type)$
     version: 3.8.1