diff --git a/.github/actions/tune-runner-vm/action.yml b/.github/actions/tune-runner-vm/action.yml
new file mode 100644
index 00000000000..c06846b18b7
--- /dev/null
+++ b/.github/actions/tune-runner-vm/action.yml
@@ -0,0 +1,30 @@
+name: Tune Runner VM performance
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+description: Tunes the GitHub Runner VM operation system
+runs:
+  using: composite
+  steps:
+    - run: |
+        if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+            # Ensure that reverse lookups for current hostname are handled properly
+            # Add the current IP address, long hostname and short hostname record to /etc/hosts file
+            echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
+        fi
+      shell: bash
+
diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml
index 272ec2604f6..a263e89fab2 100644
--- a/.github/workflows/master.yml
+++ b/.github/workflows/master.yml
@@ -45,6 +45,8 @@ jobs:
       SPARK_LOCAL_IP: localhost
     steps:
       - uses: actions/checkout@v2.3.5
+      - name: Tune Runner VM
+        uses: ./.github/actions/tune-runner-vm
       - name: Setup JDK ${{ matrix.java }}
         uses: actions/setup-java@v2
         with:
@@ -101,6 +103,8 @@ jobs:
       SPARK_LOCAL_IP: localhost
     steps:
       - uses: actions/checkout@v2.3.5
+      - name: Tune Runner VM
+        uses: ./.github/actions/tune-runner-vm
       - name: Setup JDK 8
         uses: actions/setup-java@v2
         with:
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 3dd33c07c1e..067e3c266eb 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -16,6 +16,8 @@ jobs:
       SPARK_LOCAL_IP: localhost
     steps:
       - uses: actions/checkout@v2.3.5
+      - name: Tune Runner VM
+        uses: ./.github/actions/tune-runner-vm
       - name: Setup JDK 8
         uses: actions/setup-java@v2
         with: