diff --git a/.secrets.baseline b/.secrets.baseline
index a1f236953..7d7b64372 100644
--- a/.secrets.baseline
+++ b/.secrets.baseline
@@ -7,6 +7,9 @@
     {
       "name": "AWSKeyDetector"
     },
+    {
+      "name": "AzureStorageKeyDetector"
+    },
     {
       "name": "Base64HighEntropyString",
       "limit": 4.5
@@ -17,9 +20,15 @@
     {
       "name": "CloudantDetector"
     },
+    {
+      "name": "DiscordBotTokenDetector"
+    },
+    {
+      "name": "GitHubTokenDetector"
+    },
     {
       "name": "HexHighEntropyString",
-      "limit": 3
+      "limit": 3.0
     },
     {
       "name": "IbmCloudIamDetector"
@@ -37,15 +46,24 @@
     {
       "name": "MailchimpDetector"
     },
+    {
+      "name": "NpmDetector"
+    },
     {
       "name": "PrivateKeyDetector"
     },
+    {
+      "name": "SendGridDetector"
+    },
     {
       "name": "SlackDetector"
     },
     {
       "name": "SoftlayerDetector"
     },
+    {
+      "name": "SquareOAuthDetector"
+    },
     {
       "name": "StripeDetector"
     },
@@ -57,10 +75,6 @@
     {
       "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
     },
-    {
-      "path": "detect_secrets.filters.common.is_baseline_file",
-      "filename": ".secrets.baseline"
-    },
     {
       "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
       "min_level": 2
@@ -94,155 +108,289 @@
     }
   ],
   "results": {
-    ".travis.yml": [
+    "ctds-test-env.planx-pla.net/manifest.json": [
       {
-        "type": "Base64 High Entropy String",
-        "filename": ".travis.yml",
-        "hashed_secret": "9c612d7138980158f6ad7401605a1291503c5590",
+        "type": "Secret Keyword",
+        "filename": "ctds-test-env.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 61
       },
       {
-        "type": "Base64 High Entropy String",
-        "filename": ".travis.yml",
-        "hashed_secret": "3b351018a9e5044210b39f5027a42d49e80136df",
+        "type": "Secret Keyword",
+        "filename": "ctds-test-env.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 64
+        "line_number": 159
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "ctds-test-env.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 165
       }
     ],
-    "qa-ibd.planx-pla.net/manifest.json": [
+    "jenkins-blood.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-ibd.planx-pla.net/manifest.json",
+        "filename": "jenkins-blood.planx-pla.net/manifest.json",
         "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 70
-      }
-    ],
-    "jenkins-blood.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 74
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-blood.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-blood.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 53
-      }
-    ],
-    "jenkins-brain.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 242
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-brain.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-blood.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 53
+        "line_number": 248
       }
     ],
-    "jenkins-dcp.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-brain.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-dcp.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-brain.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 82
-      }
-    ],
-    "jenkins-genomel.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 90
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-genomel.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-brain.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 61
+        "line_number": 258
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-brain.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 264
       }
     ],
-    "jenkins-new-1.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-dcp.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 84
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-new-1.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 252
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 258
       }
     ],
-    "jenkins-new-2.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-genomel.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-genomel.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 92
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-genomel.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
+        "is_verified": false,
+        "line_number": 260
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-new-2.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-genomel.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 266
       }
     ],
-    "jenkins-new-3.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-new-1.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-1.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 84
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-new-3.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-new-1.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 252
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-1.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 258
       }
     ],
-    "jenkins-new-4.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-new-2.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-2.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 82
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-2.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
+        "is_verified": false,
+        "line_number": 250
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-new-4.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-new-2.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 256
       }
     ],
-    "jenkins-new.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-new-3.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-new.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-new-3.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 60
+        "line_number": 82
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-3.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
+        "is_verified": false,
+        "line_number": 250
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-3.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 256
       }
     ],
-    "jenkins-niaid.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-new-4.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-4.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 82
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-niaid.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-new-4.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 91
+        "line_number": 250
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new-4.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 256
       }
     ],
-    "jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-new.planx-pla.net/manifest.json": [
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 84
+      },
       {
         "type": "Secret Keyword",
-        "filename": "jenkins-perf.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-new.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 53
+        "line_number": 252
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-new.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 258
       }
     ],
-    "qa-bloodpac.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "jenkins-niaid.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-bloodpac.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "jenkins-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 82
+        "line_number": 94
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
+        "is_verified": false,
+        "line_number": 262
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "jenkins-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 268
       }
     ],
-    "qa-brain.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "qa-anvil.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-brain.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-anvil.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 117
+        "line_number": 144
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "qa-anvil.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
+        "is_verified": false,
+        "line_number": 150
+      },
+      {
+        "type": "Secret Keyword",
+        "filename": "qa-anvil.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
+        "is_verified": false,
+        "line_number": 255
       }
     ],
-    "qa-brh.planx-pla.net/dashboard/Public/notebooks/AnVIL_1k_Genome_data_analysis.html": [
+    "qa-bloodpac.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-brh.planx-pla.net/dashboard/Public/notebooks/AnVIL_1k_Genome_data_analysis.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "filename": "qa-bloodpac.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 8484
+        "line_number": 77
       }
     ],
     "qa-brh.planx-pla.net/dashboard/Public/notebooks/BDCat_Framingham_study_exploration_R.html": [
@@ -277,40 +425,29 @@
         "line_number": 23219
       }
     ],
-    "qa-brh.planx-pla.net/dashboard/Public/notebooks/JCOIN_MOUD_accessibility_jupyter_notebook_BRH.html": [
+    "qa-brh.planx-pla.net/manifests/hatchery/hatchery.json": [
       {
-        "type": "Secret Keyword",
-        "filename": "qa-brh.planx-pla.net/dashboard/Public/notebooks/JCOIN_MOUD_accessibility_jupyter_notebook_BRH.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "type": "Base64 High Entropy String",
+        "filename": "qa-brh.planx-pla.net/manifests/hatchery/hatchery.json",
+        "hashed_secret": "fb088b8531b78cd23eb31e2e0015061a8747d917",
         "is_verified": false,
-        "line_number": 8559
+        "line_number": 10
       }
     ],
-    "qa-brh.planx-pla.net/dashboard/Public/notebooks/OADC_CCLE_RNAseq_visualization.html": [
+    "qa-canine.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-brh.planx-pla.net/dashboard/Public/notebooks/OADC_CCLE_RNAseq_visualization.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "filename": "qa-canine.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 8484
-      }
-    ],
-    "qa-brh.planx-pla.net/dashboard/Public/notebooks/OADC_CCLE_gene_expression_data_analysis.html": [
+        "line_number": 82
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-brh.planx-pla.net/dashboard/Public/notebooks/OADC_CCLE_gene_expression_data_analysis.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
-        "is_verified": false,
-        "line_number": 8484
-      }
-    ],
-    "qa-brh.planx-pla.net/manifests/hatchery/hatchery.json": [
-      {
-        "type": "Base64 High Entropy String",
-        "filename": "qa-brh.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "fb088b8531b78cd23eb31e2e0015061a8747d917",
+        "filename": "qa-canine.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 10
+        "line_number": 88
       }
     ],
     "qa-covid19.planx-pla.net/dashboard/Public/index.html": [
@@ -322,15 +459,6 @@
         "line_number": 7
       }
     ],
-    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/3D_Protein_Vis.html": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/3D_Protein_Vis.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
-        "is_verified": false,
-        "line_number": 8484
-      }
-    ],
     "qa-covid19.planx-pla.net/dashboard/Public/notebooks/3D_Protein_Vis_7D4F_view.html": [
       {
         "type": "Base64 High Entropy String",
@@ -6697,55 +6825,23 @@
     ],
     "qa-covid19.planx-pla.net/dashboard/Public/notebooks/COVID-19-JHU_data_analysis_04072020.html": [
       {
-        "type": "Secret Keyword",
+        "type": "Base64 High Entropy String",
         "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/COVID-19-JHU_data_analysis_04072020.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
-        "is_verified": false,
-        "line_number": 8484
-      }
-    ],
-    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/IL_tab_charts.html": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/IL_tab_charts.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "hashed_secret": "e82561df42e317b96480dca26ca25dc7e9db6cf5",
         "is_verified": false,
-        "line_number": 8484
+        "line_number": 13136
       }
     ],
-    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/TCGA_COAD_COVID.html": [
+    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/covid19_seir.html": [
       {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/TCGA_COAD_COVID.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
-        "is_verified": false,
-        "line_number": 8484
-      }
-    ],
-    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/extended-seir.html": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/extended-seir.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "type": "Base64 High Entropy String",
+        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/covid19_seir.html",
+        "hashed_secret": "9922938342b5bd787553f92313aeffeed071d393",
         "is_verified": false,
-        "line_number": 8484
+        "line_number": 14262
       }
     ],
     "qa-covid19.planx-pla.net/dashboard/Public/notebooks/jhu_map.html": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/jhu_map.html",
-        "hashed_secret": "8aaf186f222d490d87a8b61db66e4b6889fa8786",
-        "is_verified": false,
-        "line_number": 4209
-      },
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/jhu_map.html",
-        "hashed_secret": "a3db8de940d5957d2d7b663e5407d05e49172ed4",
-        "is_verified": false,
-        "line_number": 4490
-      },
       {
         "type": "Secret Keyword",
         "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/jhu_map.html",
@@ -6754,110 +6850,75 @@
         "line_number": 4848
       }
     ],
-    "qa-covid19.planx-pla.net/dashboard/Public/notebooks/kaggle_data_analysis_04072020.html": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/kaggle_data_analysis_04072020.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
-        "is_verified": false,
-        "line_number": 8484
-      }
-    ],
     "qa-covid19.planx-pla.net/dashboard/Public/notebooks/nCoV-2019_data_analysis.html": [
       {
-        "type": "Secret Keyword",
+        "type": "Hex High Entropy String",
         "filename": "qa-covid19.planx-pla.net/dashboard/Public/notebooks/nCoV-2019_data_analysis.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "hashed_secret": "f2d22fe13bf94642d487536c6fc90a956a3d9e64",
         "is_verified": false,
-        "line_number": 8484
+        "line_number": 13356
       }
     ],
-    "qa-covid19.planx-pla.net/manifests/fence/fence-config-public.yaml": [
+    "qa-covid19.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/manifests/fence/fence-config-public.yaml",
-        "hashed_secret": "5d07e1b80e448a213b392049888111e1779a52db",
+        "filename": "qa-covid19.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 264
-      }
-    ],
-    "qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 129
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-covid19.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 89
-      }
-    ],
-    "qa-covid19.planx-pla.net/manifests/hatchery/jupyter-covid19.yaml": [
+        "line_number": 135
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-covid19.planx-pla.net/manifests/hatchery/jupyter-covid19.yaml",
-        "hashed_secret": "9b5925ea817163740dfb287a9894e8ab3aba2c18",
+        "filename": "qa-covid19.planx-pla.net/manifest.json",
+        "hashed_secret": "aee98a99696237d70b6854ee4c2d9e42bc696039",
         "is_verified": false,
-        "line_number": 19
-      }
-    ],
-    "qa-dcfdemo.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 141
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-dcfdemo.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-covid19.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 84
+        "line_number": 181
       }
     ],
-    "qa-dcp.planx-pla.net/manifests/hatchery/dicom-compose.yaml": [
+    "qa-dcp.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-dcp.planx-pla.net/manifests/hatchery/dicom-compose.yaml",
-        "hashed_secret": "afc848c316af1a89d49826c5ae9d00ed769415f3",
+        "filename": "qa-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 54
-      }
-    ],
-    "qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 73
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-dcp.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 165
-      }
-    ],
-    "qa-dcp.planx-pla.net/manifests/hatchery/notebook-app.yaml": [
+        "line_number": 241
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-dcp.planx-pla.net/manifests/hatchery/notebook-app.yaml",
-        "hashed_secret": "9b5925ea817163740dfb287a9894e8ab3aba2c18",
+        "filename": "qa-dcp.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 11
+        "line_number": 247
       }
     ],
-    "qa-heal.planx-pla.net/dashboard/Public/notebooks/JCOIN-MOUD_accessibility_analysis_02092022.html": [
+    "qa-heal.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-heal.planx-pla.net/dashboard/Public/notebooks/JCOIN-MOUD_accessibility_analysis_02092022.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "filename": "qa-heal.planx-pla.net/manifest.json",
+        "hashed_secret": "ae4a2a671a528744059cd818de9af9e13005563b",
         "is_verified": false,
-        "line_number": 8559
-      }
-    ],
-    "qa-heal.planx-pla.net/dashboard/Public/notebooks/Opioid_Environment_Toolkit_And_OEPS_R.html": [
-      {
-        "type": "Artifactory Credentials",
-        "filename": "qa-heal.planx-pla.net/dashboard/Public/notebooks/Opioid_Environment_Toolkit_And_OEPS_R.html",
-        "hashed_secret": "033cb965e2ab5d67b7165f04ab53a09ebd9aa9aa",
-        "is_verified": false,
-        "line_number": 16530
-      },
-      {
-        "type": "Artifactory Credentials",
-        "filename": "qa-heal.planx-pla.net/dashboard/Public/notebooks/Opioid_Environment_Toolkit_And_OEPS_R.html",
-        "hashed_secret": "6cba121f61fe4695fb0585420ce50cbd90ab5d79",
-        "is_verified": false,
-        "line_number": 42840
+        "line_number": 106
       }
     ],
     "qa-heal.planx-pla.net/metadata/aggregate_config.json": [
@@ -6938,6 +6999,13 @@
         "is_verified": false,
         "line_number": 349
       },
+      {
+        "type": "Hex High Entropy String",
+        "filename": "qa-heal.planx-pla.net/metadata/aggregate_config.json",
+        "hashed_secret": "dcba8bcf616d53d32351a2dad1e2cf2a2f344c52",
+        "is_verified": false,
+        "line_number": 363
+      },
       {
         "type": "Hex High Entropy String",
         "filename": "qa-heal.planx-pla.net/metadata/aggregate_config.json",
@@ -6966,13 +7034,6 @@
         "is_verified": false,
         "line_number": 391
       },
-      {
-        "type": "Hex High Entropy String",
-        "filename": "qa-heal.planx-pla.net/metadata/aggregate_config.json",
-        "hashed_secret": "dcba8bcf616d53d32351a2dad1e2cf2a2f344c52",
-        "is_verified": false,
-        "line_number": 398
-      },
       {
         "type": "Hex High Entropy String",
         "filename": "qa-heal.planx-pla.net/metadata/aggregate_config.json",
@@ -7576,49 +7637,22 @@
         "line_number": 1402
       }
     ],
-    "qa-ibd.planx-pla.net/dashboard/Public/assets/javascripts/bundle.960e086b.min.js.map": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-ibd.planx-pla.net/dashboard/Public/assets/javascripts/bundle.960e086b.min.js.map",
-        "hashed_secret": "b0ca7bb786f8ffe658442304bc6c91d70bec7788",
-        "is_verified": false,
-        "line_number": 5
-      }
-    ],
-    "qa-ibd.planx-pla.net/dashboard/Public/maintenance-page/assets/javascripts/bundle.960e086b.min.js.map": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-ibd.planx-pla.net/dashboard/Public/maintenance-page/assets/javascripts/bundle.960e086b.min.js.map",
-        "hashed_secret": "b0ca7bb786f8ffe658442304bc6c91d70bec7788",
-        "is_verified": false,
-        "line_number": 5
-      }
-    ],
-    "qa-ibd.planx-pla.net/manifests/hatchery/hatchery.json": [
-      {
-        "type": "Secret Keyword",
-        "filename": "qa-ibd.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
-        "is_verified": false,
-        "line_number": 183
-      }
-    ],
-    "qa-jcoin.planx-pla.net/dashboard/Public/notebooks/JCOIN-MOUD_accessibility_analysis_02092022.html": [
+    "qa-ibd.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-jcoin.planx-pla.net/dashboard/Public/notebooks/JCOIN-MOUD_accessibility_analysis_02092022.html",
-        "hashed_secret": "51de2b835bd35a67eb32dbcd3d77d4b96e5aa39d",
+        "filename": "qa-ibd.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 8559
+        "line_number": 70
       }
     ],
-    "qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "qa-jcoin.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-jcoin.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-jcoin.planx-pla.net/manifest.json",
+        "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865",
         "is_verified": false,
-        "line_number": 84
+        "line_number": 117
       }
     ],
     "qa-mickey.planx-pla.net/dashboard/Public/documentation/.buildinfo": [
@@ -7637,42 +7671,45 @@
         "line_number": 4
       }
     ],
-    "qa-mickey.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "qa-niaid.planx-pla.net/manifest.json": [
       {
         "type": "Secret Keyword",
-        "filename": "qa-mickey.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1",
         "is_verified": false,
-        "line_number": 190
-      }
-    ],
-    "qa-nde.planx-pla.net/manifests/hatchery/hatchery.json": [
+        "line_number": 145
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-nde.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "filename": "qa-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966",
         "is_verified": false,
-        "line_number": 172
-      }
-    ],
-    "qa-niaid.planx-pla.net/manifests/fence/fence-config-public.yaml": [
+        "line_number": 151
+      },
       {
         "type": "Secret Keyword",
-        "filename": "qa-niaid.planx-pla.net/manifests/fence/fence-config-public.yaml",
-        "hashed_secret": "5d07e1b80e448a213b392049888111e1779a52db",
+        "filename": "qa-niaid.planx-pla.net/manifest.json",
+        "hashed_secret": "aee98a99696237d70b6854ee4c2d9e42bc696039",
         "is_verified": false,
-        "line_number": 176
+        "line_number": 157
       }
     ],
-    "qa-niaid.planx-pla.net/manifests/hatchery/hatchery.json": [
+    "qa-niaid.planx-pla.net/portal/gitops.json": [
       {
-        "type": "Secret Keyword",
-        "filename": "qa-niaid.planx-pla.net/manifests/hatchery/hatchery.json",
-        "hashed_secret": "0da0e0005ca04acb407af2681d0bede6d9406039",
+        "type": "Base64 High Entropy String",
+        "filename": "qa-niaid.planx-pla.net/portal/gitops.json",
+        "hashed_secret": "0edd2cb08e4d386a7751b88cf5a23d07d09d5ef2",
+        "is_verified": false,
+        "line_number": 16
+      },
+      {
+        "type": "Base64 High Entropy String",
+        "filename": "qa-niaid.planx-pla.net/portal/gitops.json",
+        "hashed_secret": "34a215eb16cb344c99b9e3236db23b1aa432e3ed",
         "is_verified": false,
-        "line_number": 56
+        "line_number": 16
       }
     ]
   },
-  "generated_at": "2023-04-11T16:29:37Z"
+  "generated_at": "2023-07-06T21:37:41Z"
 }
diff --git a/jenkins-blood.planx-pla.net/manifest.json b/jenkins-blood.planx-pla.net/manifest.json
index dee37432d..82132ab3d 100644
--- a/jenkins-blood.planx-pla.net/manifest.json
+++ b/jenkins-blood.planx-pla.net/manifest.json
@@ -17,7 +17,7 @@
     "ws-storage": "quay.io/cdis/ws-storage:master",
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "portal": "quay.io/cdis/data-portal:master",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
@@ -31,7 +31,9 @@
     "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "sower": [
     {
diff --git a/jenkins-blood.planx-pla.net/portal/gitops.json b/jenkins-blood.planx-pla.net/portal/gitops.json
index 5c900d294..9b0679acb 100644
--- a/jenkins-blood.planx-pla.net/portal/gitops.json
+++ b/jenkins-blood.planx-pla.net/portal/gitops.json
@@ -211,7 +211,8 @@
     "analysis": true,
     "explorerPublic": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-brain.planx-pla.net/manifest.json b/jenkins-brain.planx-pla.net/manifest.json
index 38122d7da..d045619f6 100644
--- a/jenkins-brain.planx-pla.net/manifest.json
+++ b/jenkins-brain.planx-pla.net/manifest.json
@@ -21,7 +21,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -33,7 +33,9 @@
     "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "arborist": {
     "deployment_version": "2"
diff --git a/jenkins-brain.planx-pla.net/portal/gitops.json b/jenkins-brain.planx-pla.net/portal/gitops.json
index 17f387a1b..16cdd2257 100644
--- a/jenkins-brain.planx-pla.net/portal/gitops.json
+++ b/jenkins-brain.planx-pla.net/portal/gitops.json
@@ -187,7 +187,8 @@
     "explorer": true,
     "noIndex": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-dcp.planx-pla.net/manifest.json b/jenkins-dcp.planx-pla.net/manifest.json
index 96b088cef..6fc196a26 100644
--- a/jenkins-dcp.planx-pla.net/manifest.json
+++ b/jenkins-dcp.planx-pla.net/manifest.json
@@ -19,7 +19,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -31,7 +31,9 @@
     "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "arborist": {
     "deployment_version": "2"
diff --git a/jenkins-dcp.planx-pla.net/portal/gitops.json b/jenkins-dcp.planx-pla.net/portal/gitops.json
index e37be844d..e6d79e42f 100644
--- a/jenkins-dcp.planx-pla.net/portal/gitops.json
+++ b/jenkins-dcp.planx-pla.net/portal/gitops.json
@@ -191,7 +191,8 @@
   "featureFlags": {
     "explorer": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-genomel.planx-pla.net/manifest.json b/jenkins-genomel.planx-pla.net/manifest.json
index 9c6c22c4c..3c6137a97 100644
--- a/jenkins-genomel.planx-pla.net/manifest.json
+++ b/jenkins-genomel.planx-pla.net/manifest.json
@@ -19,7 +19,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -28,10 +28,12 @@
     "wts": "quay.io/cdis/workspace-token-service:master",
     "guppy": "quay.io/cdis/guppy:master",
     "sower": "quay.io/cdis/sower:master",
-    "hatchery": "quay.io/cdis/hatchery:fix_ecs_ct_length",
+    "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "arborist": {
     "deployment_version": "2"
diff --git a/jenkins-genomel.planx-pla.net/portal/gitops.json b/jenkins-genomel.planx-pla.net/portal/gitops.json
index 31389296c..8fe953039 100644
--- a/jenkins-genomel.planx-pla.net/portal/gitops.json
+++ b/jenkins-genomel.planx-pla.net/portal/gitops.json
@@ -119,7 +119,8 @@
   "featureFlags": {
     "explorer": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-new-1.planx-pla.net/manifest.json b/jenkins-new-1.planx-pla.net/manifest.json
index 78cb0ea8f..30a2a506d 100644
--- a/jenkins-new-1.planx-pla.net/manifest.json
+++ b/jenkins-new-1.planx-pla.net/manifest.json
@@ -19,7 +19,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -28,10 +28,12 @@
     "wts": "quay.io/cdis/workspace-token-service:master",
     "guppy": "quay.io/cdis/guppy:master",
     "sower": "quay.io/cdis/sower:master",
-    "hatchery": "quay.io/cdis/hatchery:fix_ecs_ct_length",
+    "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "arborist": {
     "deployment_version": "2"
diff --git a/jenkins-new-1.planx-pla.net/portal/gitops.json b/jenkins-new-1.planx-pla.net/portal/gitops.json
index 69aa763c9..edac882d3 100644
--- a/jenkins-new-1.planx-pla.net/portal/gitops.json
+++ b/jenkins-new-1.planx-pla.net/portal/gitops.json
@@ -106,7 +106,8 @@
   "featureFlags": {
     "explorer": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-new.planx-pla.net/etlMapping.yaml b/jenkins-new.planx-pla.net/etlMapping.yaml
index 80db35704..75adb5e35 100644
--- a/jenkins-new.planx-pla.net/etlMapping.yaml
+++ b/jenkins-new.planx-pla.net/etlMapping.yaml
@@ -88,8 +88,7 @@ mappings:
             src: data_category
             fn: set
           - name: file_count
-            src: file_id
-            alternate_src: _file_id
+            src: _file_id
             fn: count
     parent_props:
       - path: projects[project_code:code]
diff --git a/jenkins-new.planx-pla.net/manifest.json b/jenkins-new.planx-pla.net/manifest.json
index f91071e1d..0cffc51ed 100644
--- a/jenkins-new.planx-pla.net/manifest.json
+++ b/jenkins-new.planx-pla.net/manifest.json
@@ -19,7 +19,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -28,10 +28,12 @@
     "wts": "quay.io/cdis/workspace-token-service:master",
     "guppy": "quay.io/cdis/guppy:master",
     "sower": "quay.io/cdis/sower:master",
-    "hatchery": "quay.io/cdis/hatchery:fix_ecs_ct_length",
+    "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
     "dashboard": "quay.io/cdis/gen3-statics:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "arborist": {
     "deployment_version": "2"
diff --git a/jenkins-new.planx-pla.net/portal/gitops.json b/jenkins-new.planx-pla.net/portal/gitops.json
index 69aa763c9..edac882d3 100644
--- a/jenkins-new.planx-pla.net/portal/gitops.json
+++ b/jenkins-new.planx-pla.net/portal/gitops.json
@@ -106,7 +106,8 @@
   "featureFlags": {
     "explorer": true,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/jenkins-niaid.planx-pla.net/manifest.json b/jenkins-niaid.planx-pla.net/manifest.json
index ead0d8728..5c986aafb 100644
--- a/jenkins-niaid.planx-pla.net/manifest.json
+++ b/jenkins-niaid.planx-pla.net/manifest.json
@@ -19,7 +19,7 @@
     "peregrine": "quay.io/cdis/peregrine:master",
     "pidgin": "quay.io/cdis/pidgin:master",
     "portal": "quay.io/cdis/data-portal:master",
-    "revproxy": "quay.io/cdis/nginx:1.17.6-ctds-1.0.1",
+    "revproxy": "quay.io/cdis/nginx:master",
     "sheepdog": "quay.io/cdis/sheepdog:master",
     "spark": "quay.io/cdis/gen3-spark:master",
     "tube": "quay.io/cdis/tube:master",
@@ -28,9 +28,11 @@
     "wts": "quay.io/cdis/workspace-token-service:master",
     "guppy": "quay.io/cdis/guppy:master",
     "sower": "quay.io/cdis/sower:master",
-    "hatchery": "quay.io/cdis/hatchery:fix_ecs_ct_length",
+    "hatchery": "quay.io/cdis/hatchery:master",
     "metadata": "quay.io/cdis/metadata-service:master",
-    "requestor": "quay.io/cdis/requestor:master"
+    "requestor": "quay.io/cdis/requestor:master",
+    "cedar-wrapper": "quay.io/cdis/cedar-wrapper-service:master",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:master"
   },
   "portal": {
     "GEN3_BUNDLE": "nct"
diff --git a/jenkins-niaid.planx-pla.net/portal/gitops.json b/jenkins-niaid.planx-pla.net/portal/gitops.json
index b710704a7..555e315c8 100644
--- a/jenkins-niaid.planx-pla.net/portal/gitops.json
+++ b/jenkins-niaid.planx-pla.net/portal/gitops.json
@@ -115,7 +115,8 @@
   "featureFlags": {
     "explorer": false,
     "discovery": true,
-    "discoveryUseAggMDS": true
+    "discoveryUseAggMDS": true,
+    "studyRegistration": true
   },
   "discoveryConfig": {
     "features": {
diff --git a/qa-brh.planx-pla.net/manifest.json b/qa-brh.planx-pla.net/manifest.json
index 15fca29f6..b2c9b201b 100644
--- a/qa-brh.planx-pla.net/manifest.json
+++ b/qa-brh.planx-pla.net/manifest.json
@@ -15,7 +15,7 @@
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
     "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.06",
     "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.06",
-    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.1.1",
+    "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.1.2",
     "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.06",
     "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.06",
     "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2023.06",
diff --git a/qa-ibd.planx-pla.net/manifest.json b/qa-ibd.planx-pla.net/manifest.json
index 432691768..3c0410658 100644
--- a/qa-ibd.planx-pla.net/manifest.json
+++ b/qa-ibd.planx-pla.net/manifest.json
@@ -14,7 +14,7 @@
     "pidgin": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/pidgin:2023.06",
     "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2023.06",
     "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2023.06",
-    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:2023.06",
+    "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.8.0",
     "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0",
     "spark": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-spark:2023.06",
     "tube": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/tube:2023.06",
@@ -23,7 +23,7 @@
     "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2023.06",
     "ambassador": "quay.io/datawire/ambassador:1.4.2",
     "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.06",
-    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:2023.06",
+    "guppy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy:0.16.1",
     "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2023.06",
     "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2023.06",
     "sower": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sower:2023.06"
diff --git a/qa-ibd.planx-pla.net/portal/gitops.json b/qa-ibd.planx-pla.net/portal/gitops.json
index 1a4c9b95d..a0741c0cc 100644
--- a/qa-ibd.planx-pla.net/portal/gitops.json
+++ b/qa-ibd.planx-pla.net/portal/gitops.json
@@ -577,6 +577,7 @@
         "enabled": true,
         "text": "Publications"
       },
+      "guidType": "publication_discovery_metadata",
       "search": {
         "tagSearchDropdown": {
           "enabled": true,