diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
new file mode 100644
index 00000000000..13dad91b2fa
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.yml
@@ -0,0 +1,16 @@
+name: "🙋 Question"
+description: Question related to Dgraph
+title: "[QUESTION]: <Title>"
+labels: ["kind/question ", "status/triage"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        The issue tracker is not for questions.
+        - If you have a question, please try asking it on https://discuss.dgraph.io
+        - Our Docs: https://dgraph.io/docs/
+        - If it is code related, you could open it here
+  - type: textarea
+    attributes:
+      label: Question.
+      description: Ask your Question.
diff --git a/.github/workflows/ci-dgraph-code-coverage.yml b/.github/workflows/ci-dgraph-code-coverage.yml
index e2300fffbe9..22f0262935e 100644
--- a/.github/workflows/ci-dgraph-code-coverage.yml
+++ b/.github/workflows/ci-dgraph-code-coverage.yml
@@ -9,7 +9,7 @@ on:
       - 'release/**'
 jobs:
   dgraph-code-coverage:
-    runs-on: warp-ubuntu-latest-x64-16x
+    runs-on: warp-ubuntu-latest-x64-4x
     steps:
       - uses: actions/checkout@v4 # defaults to SHA of event that triggered workflow
       - name: Get Go Version
diff --git a/.github/workflows/ci-dgraph-load-tests.yml b/.github/workflows/ci-dgraph-load-tests.yml
index 4ab729f01f1..9ed5fce0fae 100644
--- a/.github/workflows/ci-dgraph-load-tests.yml
+++ b/.github/workflows/ci-dgraph-load-tests.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   dgraph-load-tests:
     if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-x64-16x
+    runs-on: warp-ubuntu-latest-x64-4x
     steps:
       - uses: actions/checkout@v4
       - name: Get Go Version
diff --git a/.github/workflows/ci-dgraph-tests-arm64.yml b/.github/workflows/ci-dgraph-tests-arm64.yml
index c389b323747..f47ab59c07a 100644
--- a/.github/workflows/ci-dgraph-tests-arm64.yml
+++ b/.github/workflows/ci-dgraph-tests-arm64.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   dgraph-tests:
     if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-arm64-16x
+    runs-on: warp-ubuntu-latest-arm64-4x
     steps:
       - uses: actions/checkout@v4
       - name: Get Go Version
diff --git a/.github/workflows/ci-dgraph-tests.yml b/.github/workflows/ci-dgraph-tests.yml
index 139cd309357..a4979c1d70f 100644
--- a/.github/workflows/ci-dgraph-tests.yml
+++ b/.github/workflows/ci-dgraph-tests.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   dgraph-tests:
     if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-x64-16x
+    runs-on: warp-ubuntu-latest-x64-4x
     steps:
       - uses: actions/checkout@v4
       - name: Get Go Version
diff --git a/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml b/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml
index df41840b36d..4dc68e40326 100644
--- a/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml
+++ b/.github/workflows/ci-dgraph-upgrade-fixed-versions-tests.yml
@@ -4,7 +4,7 @@ on:
     - cron: "00 20 * * *" # 1 run per day
 jobs:
   dgraph-upgrade-fixed-versions-tests:
-    runs-on: warp-ubuntu-latest-x64-16x 
+    runs-on: warp-ubuntu-latest-x64-4x 
     timeout-minutes: 720
     steps:
       - uses: actions/checkout@v4
diff --git a/.github/workflows/ci-dgraph-upgrade-tests.yml b/.github/workflows/ci-dgraph-upgrade-tests.yml
index 9c1550cb336..cc1d52f04a9 100644
--- a/.github/workflows/ci-dgraph-upgrade-tests.yml
+++ b/.github/workflows/ci-dgraph-upgrade-tests.yml
@@ -15,7 +15,7 @@ on:
 jobs:
   dgraph-upgrade-tests:
     if: github.event.pull_request.draft == false
-    runs-on: warp-ubuntu-latest-x64-16x 
+    runs-on: warp-ubuntu-latest-x64-4x 
     steps:
       - uses: actions/checkout@v4
         with: