diff --git a/build/ci-build.yml b/build/ci-build.yml
index 2a25f159..457f48ea 100644
--- a/build/ci-build.yml
+++ b/build/ci-build.yml
@@ -25,20 +25,13 @@ resources:
       endpoint: arcus-azure
 
 # 'Package.Version.ManualTrigger' is added as queue-time variable on build in Azure DevOps
-# 'Arcus.ServiceBus.ConnectionStringWithQueue' is added as secret variable on build in Azure DevOps
-# 'Arcus.ServiceBus.ConnectionStringWithTopic' is added as secret variable on build in Azure DevOps
-# 'Arcus.TestInfra.ServiceBus.Topic.ConnectionString' is added as secret variable on build in Azure DevOps
-# 'Arcus.TestInfra.EventGrid.Auth.Key' is added as secret variable on build in Azure DevOps
 variables:
+  - group: 'Arcus Messaging - Integration Testing'
   - group: 'Arcus - GitHub Package Registry'
   - group: 'Arcus Messaging - .NET'
   - group: 'Build Configuration'
   - name: 'Project'
     value: 'Arcus.Messaging'
-  - name: 'Arcus.TestInfra.EventGrid.Topic.Uri'
-    value: 'https://arcus-event-grid-dev-we-integration-tests.westeurope-1.eventgrid.azure.net/api/events'
-  - name: 'Arcus.TestInfra.ServiceBus.Topic.Name'
-    value: 'received-event-grid-events' # We are re-using the Event Grid integration infrastructure
 
 stages:
   - stage: Build
diff --git a/build/nuget-release.yml b/build/nuget-release.yml
index 777ff1ce..d7cc3150 100644
--- a/build/nuget-release.yml
+++ b/build/nuget-release.yml
@@ -11,6 +11,7 @@ resources:
       endpoint: arcus-azure
 
 variables:
+  - group: 'Arcus Messaging - Integration Testing'
   - group: 'Arcus Security - Integration Testing'
   - group: 'Arcus - GitHub Package Registry'
   - group: 'Arcus Messaging - .NET'
@@ -18,8 +19,6 @@ variables:
   - name: 'Project'
     value: 'Arcus.Messaging'
 # 'Package.Version' is added as queue-time variable on build in Azure DevOps
-# 'Arcus.ServiceBus.ConnectionStringWithQueue' is added as secret variable on build in Azure DevOps
-# 'Arcus.ServiceBus.ConnectionStringWithTopic' is added as secret variable on build in Azure DevOps
 
 stages:
   - stage: Build