diff --git a/api/cloudbuild.yaml b/api/cloudbuild.yaml
index 4bc8cce3b8..479326a33f 100644
--- a/api/cloudbuild.yaml
+++ b/api/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
   args:
     [
       '-c',
-      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
     ]
 
 - name: mikewilliamson/wait-for
diff --git a/scanners/domain-dispatcher/cloudbuild.yaml b/scanners/domain-dispatcher/cloudbuild.yaml
index a7a7b49e8b..a0410c0d10 100644
--- a/scanners/domain-dispatcher/cloudbuild.yaml
+++ b/scanners/domain-dispatcher/cloudbuild.yaml
@@ -6,7 +6,7 @@ steps:
     args:
       [
         '-c',
-        'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+        'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
       ]
 
   - name: mikewilliamson/wait-for
diff --git a/scripts/domain-loader/cloudbuild.yaml b/scripts/domain-loader/cloudbuild.yaml
index a97845babb..5a54899298 100644
--- a/scripts/domain-loader/cloudbuild.yaml
+++ b/scripts/domain-loader/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
   args:
     [
       '-c',
-      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
     ]
 
 - name: mikewilliamson/wait-for
diff --git a/services/dmarc-report/cloudbuild.yaml b/services/dmarc-report/cloudbuild.yaml
index 0aa77ebec6..dcbf6e146b 100644
--- a/services/dmarc-report/cloudbuild.yaml
+++ b/services/dmarc-report/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
   args:
     [
       '-c',
-      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
     ]
 
 - name: mikewilliamson/wait-for
diff --git a/services/org-footprint/cloudbuild.yaml b/services/org-footprint/cloudbuild.yaml
index a4333c813f..40e4b08ef1 100644
--- a/services/org-footprint/cloudbuild.yaml
+++ b/services/org-footprint/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
     args:
       [
         '-c',
-        'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+        'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
       ]
 
   - name: mikewilliamson/wait-for
diff --git a/services/org-footprint/src/__tests__/notify-send-org-footprint-email.test.js b/services/org-footprint/src/__tests__/notify-send-org-footprint-email.test.js
index 491422ee27..87c78dc012 100644
--- a/services/org-footprint/src/__tests__/notify-send-org-footprint-email.test.js
+++ b/services/org-footprint/src/__tests__/notify-send-org-footprint-email.test.js
@@ -38,12 +38,14 @@ describe('given the sendOrgFootprintEmail function', () => {
         {
           action: 'remove',
           target: {
+            resource: 'domain1',
             resourceType: 'domain',
           },
         },
         {
           action: 'update',
           target: {
+            resource: 'domain2',
             resourceType: 'domain',
           },
         },
@@ -67,8 +69,12 @@ describe('given the sendOrgFootprintEmail function', () => {
           update_users_count: 0,
           remove_users_count: 0,
           add_domains_count: 0,
+          add_domains_list: '',
           update_domains_count: 1,
+          update_domains_list: 'domain2',
           remove_domains_count: 1,
+          remove_domains_list: 'domain1',
+          export_count: 0,
         },
       })
     })
diff --git a/services/org-footprint/src/notify/notify-send-org-footprint-email.js b/services/org-footprint/src/notify/notify-send-org-footprint-email.js
index e1be2cf13b..37ae6aa765 100644
--- a/services/org-footprint/src/notify/notify-send-org-footprint-email.js
+++ b/services/org-footprint/src/notify/notify-send-org-footprint-email.js
@@ -22,15 +22,15 @@ const sendOrgFootprintEmail = async ({ notifyClient, user, auditLogs, orgNames }
 
   // Get list of domains added
   if (domainsAdded.length > 0) {
-    addDomainsList = '\t' + domainsAdded.map((log) => log.target.resource).join(', ')
+    addDomainsList = domainsAdded.map((log) => log.target.resource).join(', ')
   }
   // Get list of domains updated
   if (domainsUpdated.length > 0) {
-    updateDomainsList = '\t' + domainsUpdated.map((log) => log.target.resource).join(', ')
+    updateDomainsList = domainsUpdated.map((log) => log.target.resource).join(', ')
   }
   // Get list of domains removed
   if (domainsRemoved.length > 0) {
-    removeDomainsList = '\t' + domainsRemoved.map((log) => log.target.resource).join(', ')
+    removeDomainsList = domainsRemoved.map((log) => log.target.resource).join(', ')
   }
 
   const exportsToCsv = auditLogs.filter((log) => log.action === 'export')
diff --git a/services/summaries/cloudbuild.yaml b/services/summaries/cloudbuild.yaml
index 38116c1f13..e28d878524 100644
--- a/services/summaries/cloudbuild.yaml
+++ b/services/summaries/cloudbuild.yaml
@@ -2,7 +2,7 @@ steps:
   - name: 'gcr.io/cloud-builders/docker'
     id: start_testdb
     entrypoint: /bin/sh
-    args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb"]
+    args: ["-c", "docker run --net cloudbuild --name testdb -e ARANGO_NO_AUTH=1 -d -p 127.0.0.1:8529:8529 arangodb/arangodb:3.10.4"]
 
   - name: mikewilliamson/wait-for
     id: wait_testdb
diff --git a/services/super-admin/cloudbuild.yaml b/services/super-admin/cloudbuild.yaml
index 3a2cbd6022..35a65b28d3 100644
--- a/services/super-admin/cloudbuild.yaml
+++ b/services/super-admin/cloudbuild.yaml
@@ -5,7 +5,7 @@ steps:
   args:
     [
       '-c',
-      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb',
+      'docker run -d --network=cloudbuild -p=8529:8529 -e ARANGO_ROOT_PASSWORD=$_DB_PASS --name=arangodb arangodb/arangodb:3.10.4',
     ]
 
 - name: mikewilliamson/wait-for