diff --git a/.github/workflows/deploy.nightly.devnet.yml b/.github/workflows/deploy.nightly.devnet.yml
index dc4cfb6baf..5bb10492dd 100644
--- a/.github/workflows/deploy.nightly.devnet.yml
+++ b/.github/workflows/deploy.nightly.devnet.yml
@@ -9,7 +9,7 @@ on:  # yamllint disable-line rule:truthy
         required: false
         type: environment
       duration:
-        default: '10m'
+        default: "10m"
         description: Duration of the test
         required: false
         type: string
@@ -20,7 +20,7 @@ on:  # yamllint disable-line rule:truthy
         type: string
         required: true
       duration:
-        default: '10m'
+        default: "10m"
         description: Duration of the test
         required: false
         type: string
@@ -40,6 +40,8 @@ on:  # yamllint disable-line rule:truthy
         required: true
       TF_VAR_OWNER:
         required: true
+      TF_VAR_BASE_INSTANCE_TYPE:
+        required: true
       SLACK_PERFORMANCE_WEBHOOK_URL:
         required: true
       DD_API_KEY:
@@ -78,18 +80,13 @@ jobs:
         id: validate
         run: terraform validate -no-color
         continue-on-error: true
-      - name: Terraform Plan
-        id: plan
-        run: terraform plan -out=tfplan -no-color
-        env:
-          TF_VAR_deployment_name: ${{ secrets.TF_VAR_DEPLOYMENT_NAME }}
-          TF_VAR_owner: ${{ secrets.TF_VAR_OWNER }}
       - name: Terraform Apply
         id: apply
-        run: terraform apply -auto-approve tfplan
+        run: terraform apply -auto-approve
         env:
           TF_VAR_deployment_name: ${{ secrets.TF_VAR_DEPLOYMENT_NAME }}
           TF_VAR_owner: ${{ secrets.TF_VAR_OWNER }}
+          TF_VAR_base_instance_type: ${{ secrets.TF_VAR_BASE_INSTANCE_TYPE }}
       - name: Retrieve state file from s3
         run: aws s3 cp s3://polygon-edge-devnet-terraform-states/state/${{ secrets.TF_VAR_DEPLOYMENT_NAME }} state.json
       - name: Configure private keys
@@ -288,3 +285,4 @@ jobs:
         env:
           TF_VAR_deployment_name: ${{ secrets.TF_VAR_DEPLOYMENT_NAME }}
           TF_VAR_owner: ${{ secrets.TF_VAR_OWNER }}
+          TF_VAR_base_instance_type: ${{ secrets.TF_VAR_BASE_INSTANCE_TYPE }}
diff --git a/.github/workflows/manual.deploy.nightly.devnet.yml b/.github/workflows/manual.deploy.nightly.devnet.yml
index 7071112ce3..c5610dfbbb 100644
--- a/.github/workflows/manual.deploy.nightly.devnet.yml
+++ b/.github/workflows/manual.deploy.nightly.devnet.yml
@@ -7,13 +7,6 @@ on:  # yamllint disable-line rule:truthy
     branches:
       - jesse/fix-*
   workflow_call: {}
-  workflow_dispatch:
-    inputs:
-      duration:
-        default: '10m'
-        description: Duration of the test
-        required: false
-        type: string
 
 permissions:
   id-token: write
@@ -29,10 +22,10 @@ jobs:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
       TF_VAR_DEPLOYMENT_NAME: ${{ secrets.TF_VAR_DEPLOYMENT_NAME }}
       TF_VAR_OWNER: ${{ secrets.TF_VAR_OWNER }}
+      TF_VAR_BASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_BASE_INSTANCE_TYPE }}
       SLACK_PERFORMANCE_WEBHOOK_URL: ${{ secrets.SLACK_PERFORMANCE_WEBHOOK_URL }}
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
       LOADTEST_MNEMONIC: ${{ secrets.LOADTEST_MNEMONIC }}
       VAULT_PASSWORD_FILE: ${{ secrets.VAULT_PASSWORD_FILE }}
     with:
       environment: devnet
-      duration: ${{ inputs.duration }}
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index ee5d516b2f..597e50869e 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -52,6 +52,7 @@ jobs:
       AWS_ROLE_ARN: ${{ secrets.AWS_ROLE_ARN }}
       TF_VAR_DEPLOYMENT_NAME: ${{ secrets.TF_VAR_DEPLOYMENT_NAME }}
       TF_VAR_OWNER: ${{ secrets.TF_VAR_OWNER }}
+      TF_VAR_BASE_INSTANCE_TYPE: ${{ secrets.TF_VAR_BASE_INSTANCE_TYPE }}
       SLACK_PERFORMANCE_WEBHOOK_URL: ${{ secrets.SLACK_PERFORMANCE_WEBHOOK_URL }}
       DD_API_KEY: ${{ secrets.DD_API_KEY }}
       LOADTEST_MNEMONIC: ${{ secrets.LOADTEST_MNEMONIC }}