diff --git a/.github/workflows/deploy-hds-auth-gateway.yaml b/.github/workflows/deploy-hds-auth-gateway.yaml
index f02bb975..632d9bae 100644
--- a/.github/workflows/deploy-hds-auth-gateway.yaml
+++ b/.github/workflows/deploy-hds-auth-gateway.yaml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   Deploy_HDS_Auth_Gateway_With_Token_Authenticator_Image:
-    runs-on: [self-hosted, research] 
+    runs-on: ubuntu-20.04 
     steps:
       - name: Import Secrets
         id: secrets
diff --git a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml
index fdaf1a32..37bce543 100644
--- a/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml
+++ b/.github/workflows/update-oauth2-proxy-version-at-api-gw.yaml
@@ -16,7 +16,7 @@ on:
 
 jobs:
   Deploy:
-    runs-on: [self-hosted, research] 
+    runs-on: ubuntu-20.04 
     steps:
       - name: Import Secrets
         id: secrets