diff --git a/.github/scripts/deploy-instance.sh b/.github/scripts/deploy-instance.sh
index e1d5be4..ccf185c 100644
--- a/.github/scripts/deploy-instance.sh
+++ b/.github/scripts/deploy-instance.sh
@@ -28,11 +28,13 @@ if ! kubectl get namespace/ci-{{INSTANCE}}-ns-pm4 >/dev/null 2>&1; then
     echo "Removing Job"
     kubectl delete job mysql-setup-job-ci-{{INSTANCE}}
     echo "Deploying Instance :: ci-{{INSTANCE}}"
+    echo "OCTANE: ${OCTANE}"
     cat .github/templates/instance.yaml
     # Evaluate the command and store the result
     APP_VERSION=$(echo "$CI_PROJECT-$CI_PACKAGE_BRANCH" | sed "s;/;-;g" | sed "s/refs-heads-//g")
 
     helm install --timeout 75m -f .github/templates/instance.yaml ci-{{INSTANCE}} processmaker/enterprise \
+        --set deploy.web.octane.enable=${OCTANE} \
         --set deploy.pmai.openaiApiKey=${OPENAI_API_KEY} \
         --set analytics.awsAccessKey=${ANALYTICS_AWS_ACCESS_KEY} \
         --set analytics.awsSecretKey=${ANALYTICS_AWS_SECRET_KEY} \
diff --git a/.github/workflows/deploy-pm4.yml b/.github/workflows/deploy-pm4.yml
index 14835ab..3ca81e0 100644
--- a/.github/workflows/deploy-pm4.yml
+++ b/.github/workflows/deploy-pm4.yml
@@ -30,7 +30,8 @@ env:
   DOM_EKS: ${{ secrets.DOM_EKS }}
   GIT_TOKEN: ${{ secrets.GIT_TOKEN }}
   BUILD_BASE: ${{ (contains(github.event.pull_request.body, 'ci:build-base') || github.event_name == 'schedule') && '1' || '0' }}
-  MULTITENANCY: ${{ (contains(github.event.pull_request.body, 'ci:multitenancy')) && 'true' || 'false' }}
+  MULTITENANCY: ${{ contains(github.event.pull_request.body, 'ci:single-tenant') && 'false' || 'true' }}
+  OCTANE: ${{ contains(github.event.pull_request.body, 'ci:no-octane') && 'false' || 'true' }}
   BASE_IMAGE: ${{ secrets.REGISTRY_HOST }}/processmaker/processmaker:base
   CUSTOMER_LICENSES_PAT: ${{ secrets.CUSTOMER_LICENSES_PAT }}
   SKIP_REDEPLOY: ${{ (contains(github.event.pull_request.body, 'ci:skip-redeploy')) && 'true' || 'false' }}
@@ -200,6 +201,7 @@ jobs:
           RDS_ADMIN_PASSWORD: ${{ secrets.RDS_ADMIN_PASSWORD }}
           AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
           AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          OCTANE: ${{ env.OCTANE }}
         run: |
           instance=$(echo -n ${{env.IMAGE_TAG}} | md5sum | head -c 10)
           echo "INSTANCE: $instance"
diff --git a/.gitignore b/.gitignore
index 3ff048c..01d63c2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
 .envrc
+pm4-eng.yaml