diff --git a/.github/actions/fix-etc-hosts/action.yml b/.github/actions/fix-etc-hosts/action.yml
new file mode 100644
index 000000000..15efcaed2
--- /dev/null
+++ b/.github/actions/fix-etc-hosts/action.yml
@@ -0,0 +1,18 @@
+name: Fix /etc/hosts
+description: |
+  Workaround for
+  "Reverse name lookup is broken for current hostname in ubuntu-latest VMs",
+  reported as https://github.com/actions/virtual-environments/issues/3185
+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
+            eth0_ip_addr=$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)
+            hostname_fqdn=$(hostname -f)
+            hostname_short=$(hostname -s)
+            echo -e "${eth0_ip_addr}\t${hostname_fqdn} ${hostname_short}" | sudo tee -a /etc/hosts
+        fi
+      shell: bash
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 499d241b7..1f4bff233 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,8 +76,9 @@ jobs:
       LIBMESH: ${{ matrix.libmesh }}
 
     steps:
-      -
-        uses: actions/checkout@v2
+      - uses: actions/checkout@v2
+
+      - uses: ./.github/actions/fix-etc-hosts
 
       -
         name: Set up Python ${{ matrix.python-version }}