diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
index c55b5b778..ba98df637 100644
--- a/.github/workflows/staging.yml
+++ b/.github/workflows/staging.yml
@@ -164,59 +164,69 @@ jobs:
   # Perform tests
   tests-docker:
     needs: [create-infra-docker]
-    uses: ./.github/workflows/staging-tests.yml
-    with:
-      TYPE: docker
-      RUNS_ON: '["self-hosted", "bw-docker"]'
-    secrets:
-      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-      TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_DOCKER }}
-      ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+    runs-on: [self-hosted, bw-docker]
+    steps:
+    - uses: ./.github/workflows/staging-tests.yml
+      with:
+        TYPE: docker
+        RUNS_ON: '["self-hosted", "bw-docker"]'
+      secrets:
+        PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+        PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+        TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_DOCKER }}
+        ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-autoconf:
     needs: [create-infra-autoconf]
-    uses: ./.github/workflows/staging-tests.yml
-    with:
-      TYPE: autoconf
-      RUNS_ON: '["self-hosted", "bw-autoconf"]'
-    secrets:
-      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-      TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_AUTOCONF }}
-      ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+    runs-on: [self-hosted, bw-autoconf]
+    steps:
+    - uses: ./.github/workflows/staging-tests.yml
+      with:
+        TYPE: autoconf
+        RUNS_ON: '["self-hosted", "bw-autoconf"]'
+      secrets:
+        PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+        PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+        TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_AUTOCONF }}
+        ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-swarm:
     needs: [create-infra-swarm]
-    uses: ./.github/workflows/staging-tests.yml
-    with:
-      TYPE: swarm
-      RUNS_ON: '["self-hosted", "bw-swarm"]'
-    secrets:
-      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-      TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_SWARM }}
-      ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+    runs-on: [self-hosted, bw-swarm]
+    steps:
+    - uses: ./.github/workflows/staging-tests.yml
+      with:
+        TYPE: swarm
+        RUNS_ON: '["self-hosted", "bw-swarm"]'
+      secrets:
+        PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+        PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+        TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_SWARM }}
+        ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-k8s:
     needs: [create-infra-k8s]
-    uses: ./.github/workflows/staging-tests.yml
-    with:
-      TYPE: k8s
-      RUNS_ON: '["ubuntu-latest"]'
-    secrets:
-      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-      TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_KUBERNETES }}
-      ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+    runs-on: [ubuntu-latest]
+    steps:
+    - uses: ./.github/workflows/staging-tests.yml
+      with:
+        TYPE: k8s
+        RUNS_ON: '["ubuntu-latest"]'
+      secrets:
+        PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+        PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+        TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_KUBERNETES }}
+        ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
   tests-linux:
     needs: [create-infra-linux]
-    uses: ./.github/workflows/staging-tests.yml
-    with:
-      TYPE: linux
-      RUNS_ON: '["self-hosted", "bw-linux"]'
-    secrets:
-      PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
-      PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
-      TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
-      ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
+    runs-on: [self-hosted, bw-linux]
+    steps:
+    - uses: ./.github/workflows/staging-tests.yml
+      with:
+        TYPE: linux
+        RUNS_ON: '["self-hosted", "bw-linux"]'
+      secrets:
+        PRIVATE_REGISTRY: ${{ secrets.PRIVATE_REGISTRY }}
+        PRIVATE_REGISTRY_TOKEN: ${{ secrets.PRIVATE_REGISTRY_TOKEN }}
+        TEST_DOMAINS: ${{ secrets.TEST_DOMAINS_LINUX }}
+        ROOT_DOMAIN: ${{ secrets.ROOT_DOMAIN }}
 
   # Delete infrastructures
   delete-infra-docker:
diff --git a/tests/linux/Dockerfile-rhel b/tests/linux/Dockerfile-rhel
index 552fd6887..6176818b8 100644
--- a/tests/linux/Dockerfile-rhel
+++ b/tests/linux/Dockerfile-rhel
@@ -11,7 +11,8 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial
 
 COPY src/linux/nginx.repo /etc/yum.repos.d/nginx.repo
 
-RUN dnf install php-fpm curl yum-utils epel-release -y && \
+RUN rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm && \
+    dnf install php-fpm curl yum-utils -y && \
 	dnf install nginx-1.22.1 -y
 
 COPY ./package-rhel/*.rpm /opt
\ No newline at end of file