diff --git a/.github/workflows/agentforce-validate.yml b/.github/workflows/agentforce-validate.yml
index 32ac07c..1814581 100644
--- a/.github/workflows/agentforce-validate.yml
+++ b/.github/workflows/agentforce-validate.yml
@@ -50,6 +50,10 @@ jobs:
         run: |
           sf project deploy start --target-org=so-ci --manifest=manifestAgent.xml --wait=30
 
+      - name: 'Deploy Agentforce Tests to org'
+        run: |
+          sf project deploy start --target-org=so-ci --metadata=AiEvaluationDefinition --wait=30
+
       - name: 'Capture org auth URL'
         id: capture-org
         run: |
@@ -252,9 +256,13 @@ jobs:
           echo "${{ secrets.DEVHUB_SFDX_AUTH_URL }}" > ./authfile
           sf org login sfdx-url --sfdxurlfile=authfile --alias=devhub
 
-      - name: Return org to pool
+      - name: Authenticate to org
         run: |
           AUTH_URL=$(cat auth-artifact/auth-url.txt)
-          echo "$AUTH_URL" > ./org-auth.txt
-          sf org login sfdx-url --sfdxurlfile=org-auth.txt --alias=so-ci
-          pnpm sfp pool delete --targetdevhubusername=devhub --tag=ci-pool --myorg=so-ci
\ No newline at end of file
+          echo "$AUTH_URL" > ./authfileci
+          sf org login sfdx-url --sfdxurlfile=authfileci --alias=so-ci
+
+      - name: Return org to pool
+        run: |
+          ORG_ID=$(sf org display -o so-ci --json | jq -r '.result.id' | cut -c 1-15)
+          sf data update record -o devhub --sobject ScratchOrgInfo --where "ScratchOrg='$ORG_ID'" --values "Allocation_status__c='Available'"
diff --git a/config/pools/ci-pool.json b/config/pools/ci-pool.json
index 9d13f6f..5318885 100644
--- a/config/pools/ci-pool.json
+++ b/config/pools/ci-pool.json
@@ -1,6 +1,6 @@
 {
     "tag": "ci-pool",
-    "maxAllocation": 1,
+    "maxAllocation": 2,
     "expiry": 10,
     "batchSize": 10,
     "configFilePath": "config/project-scratch-def.json",
@@ -8,5 +8,6 @@
     "installAll": true,
     "enableSourceTracking": true,
     "retryOnFailure": true,
-    "succeedOnDeploymentErrors": true
+    "succeedOnDeploymentErrors": true,
+    "postDeploymentScriptPath": "scripts/postDeployment.sh"
 }
\ No newline at end of file
diff --git a/config/pools/dev-pool.json b/config/pools/dev-pool.json
index ab2b74e..71e2e99 100644
--- a/config/pools/dev-pool.json
+++ b/config/pools/dev-pool.json
@@ -8,5 +8,6 @@
     "installAll": true,
     "enableSourceTracking": true,
     "retryOnFailure": true,
-    "succeedOnDeploymentErrors": true
+    "succeedOnDeploymentErrors": true,
+    "postDeploymentScriptPath": "scripts/postDeployment.sh"
 }
\ No newline at end of file
diff --git a/manifestAgent.xml b/manifestAgent.xml
index fb3fbaa..68f8d93 100644
--- a/manifestAgent.xml
+++ b/manifestAgent.xml
@@ -32,9 +32,5 @@
         <members>*</members>
         <name>BotTemplate</name>
     </types>
-    <types>
-        <members>*</members>
-        <name>AiEvaluationDefinition</name>
-    </types>
     <version>65.0</version>
 </Package>
\ No newline at end of file
diff --git a/scripts/retrieveAgentAndTest.sh b/scripts/retrieveAgentAndTest.sh
new file mode 100755
index 0000000..2a6762f
--- /dev/null
+++ b/scripts/retrieveAgentAndTest.sh
@@ -0,0 +1,2 @@
+sf project retrieve start -o so-dev --manifest manifestAgent.xml
+sf project retrieve start -o so-dev --metadata AiEvaluationDefinition
\ No newline at end of file