diff --git a/.env.sample b/.env.sample
index 9e9e35b11..43f96cc04 100644
--- a/.env.sample
+++ b/.env.sample
@@ -48,6 +48,9 @@ PLATFORM_ID=
 
 AFJ_AGENT_ENDPOINT_PATH=/apps/agent-provisioning/AFJ/endpoints/
 DATABASE_URL="postgresql://postgres:xxxxxx@localhost:5432/postgres?schema=public"    #Provide supabase postgres url and Use the correct user/pwd, IP Address
+CLUSTER_NAME=""  # ecs cluster
+TESKDEFINITION_FAMILY="" # ecs task-definition
+AGENT_PROTOCOL=http
 
 # This was inserted by prisma init:
 # Environment variables declared in this file are automatically made available to Prisma.
diff --git a/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh b/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
index 1233a5de2..2e3aa6245 100644
--- a/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
+++ b/apps/agent-provisioning/AFJ/scripts/start_agent_ecs.sh
@@ -20,13 +20,14 @@ INDY_LEDGER=${15}
 AGENT_HOST=${16}
 AWS_ACCOUNT_ID=${17}
 S3_BUCKET_ARN=${18}
+CLUSTER_NAME=${19}
+TESKDEFINITION_FAMILY=${20}
 ADMIN_PORT=$((8000 + AGENCY))
 INBOUND_PORT=$((9000 + AGENCY))
 CONTROLLER_PORT=$((3000 + AGENCY))
 POSTGRES_PORT=$((5432 + AGENCY))
 
 SERVICE_NAME="${AGENCY}-${CONTAINER_NAME}-service"
-CLUSTER_NAME='agent-spinup'
 DESIRED_COUNT=1
 
 EXTERNAL_IP=$(echo "$2" | tr -d '[:space:]')
@@ -132,7 +133,7 @@ EOF
 TASK_DEFINITION=$(
   cat <<EOF
 {
-  "family": "AGENT",
+  "family": "$TESKDEFINITION_FAMILY",
   "containerDefinitions": $CONTAINER_DEFINITIONS,
   "executionRoleArn": "arn:aws:iam::${AWS_ACCOUNT_ID}:role/ecsTaskExecutionRole",
   "volumes": [
diff --git a/apps/agent-provisioning/src/agent-provisioning.service.ts b/apps/agent-provisioning/src/agent-provisioning.service.ts
index 3b85d3e2e..a0163741c 100644
--- a/apps/agent-provisioning/src/agent-provisioning.service.ts
+++ b/apps/agent-provisioning/src/agent-provisioning.service.ts
@@ -27,7 +27,7 @@ export class AgentProvisioningService {
       if (agentType === AgentType.AFJ) {
         // The wallet provision command is used to invoke a shell script
         const walletProvision = `${process.cwd() + process.env.AFJ_AGENT_SPIN_UP
-          } ${orgId} "${externalIp}" "${walletName}" "${walletPassword}" ${seed} ${webhookEndpoint} ${walletStorageHost} ${walletStoragePort} ${walletStorageUser} ${walletStoragePassword} ${containerName} ${protocol} ${tenant} ${afjVersion} ${indyLedger} ${process.env.AGENT_HOST} ${process.env.AWS_ACCOUNT_ID} ${process.env.S3_BUCKET_ARN}`;
+          } ${orgId} "${externalIp}" "${walletName}" "${walletPassword}" ${seed} ${webhookEndpoint} ${walletStorageHost} ${walletStoragePort} ${walletStorageUser} ${walletStoragePassword} ${containerName} ${protocol} ${tenant} ${afjVersion} ${indyLedger} ${process.env.AGENT_HOST} ${process.env.AWS_ACCOUNT_ID} ${process.env.S3_BUCKET_ARN} ${process.env.CLUSTER_NAME} ${process.env.TESKDEFINITION_FAMILY}`;
 
         const spinUpResponse: object = new Promise(async (resolve) => {
 
diff --git a/apps/agent-service/src/agent-service.service.ts b/apps/agent-service/src/agent-service.service.ts
index da5b3e036..ae79f30d3 100644
--- a/apps/agent-service/src/agent-service.service.ts
+++ b/apps/agent-service/src/agent-service.service.ts
@@ -213,7 +213,7 @@ export class AgentServiceService {
           orgName: orgData.name,
           indyLedger: escapedJsonString,
           afjVersion: process.env.AFJ_VERSION,
-          protocol: process.env.API_GATEWAY_PROTOCOL,
+          protocol: process.env.AGENT_PROTOCOL,
           tenant: agentSpinupDto.tenant
         };
 
diff --git a/apps/connection/src/connection.service.ts b/apps/connection/src/connection.service.ts
index ce5d0d8e0..502f002bd 100644
--- a/apps/connection/src/connection.service.ts
+++ b/apps/connection/src/connection.service.ts
@@ -62,7 +62,7 @@ export class ConnectionService {
         multiUseInvitation: multiUseInvitation || true,
         autoAcceptConnection: autoAcceptConnection || true,
         alias: alias || undefined,
-        imageUrl: logoImageUrl ? logoImageUrl : '',
+        imageUrl: logoImageUrl ? logoImageUrl : undefined,
         label: label || undefined
       };