diff --git a/.github/workflows/met-api-cd.yml b/.github/workflows/met-api-cd.yml
index d7b2d5cd1..f5776ad15 100644
--- a/.github/workflows/met-api-cd.yml
+++ b/.github/workflows/met-api-cd.yml
@@ -30,17 +30,10 @@ env:
   
   # Set OpenShift related variables based on PROJECT_TYPE
   OPENSHIFT_LOGIN_REGISTRY: ${{ secrets.OPENSHIFT_LOGIN_REGISTRY }}
-  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN }}
-  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY }}
-  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY }}
-  
-  # If PROJECT_TYPE is EAO, override the variables with EAO secrets
-  if: env.PROJECT_TYPE == 'EAO'
-  OPENSHIFT_SA_TOKEN: ${{ secrets.OPENSHIFT_SA_TOKEN_EAO }}
-  OPENSHIFT_SA_NAME: ${{ secrets.OPENSHIFT_SA_NAME_EAO }}
-  OPENSHIFT_IMAGE_REGISTRY: ${{ secrets.OPENSHIFT_IMAGE_REGISTRY_EAO }}
-  OPENSHIFT_REPOSITORY: ${{ secrets.OPENSHIFT_REPOSITORY_EAO }}
+  OPENSHIFT_SA_TOKEN: ${{ (env.PROJECT_TYPE == 'EAO') && secrets.OPENSHIFT_SA_TOKEN_EAO || secrets.OPENSHIFT_SA_TOKEN }}
+  OPENSHIFT_SA_NAME: ${{ (env.PROJECT_TYPE == 'EAO') && secrets.OPENSHIFT_SA_NAME_EAO || secrets.OPENSHIFT_SA_NAME }}
+  OPENSHIFT_IMAGE_REGISTRY: ${{ (env.PROJECT_TYPE == 'EAO') && secrets.OPENSHIFT_IMAGE_REGISTRY_EAO || secrets.OPENSHIFT_IMAGE_REGISTRY }}
+  OPENSHIFT_REPOSITORY: ${{ (env.PROJECT_TYPE == 'EAO') && secrets.OPENSHIFT_REPOSITORY_EAO || secrets.OPENSHIFT_REPOSITORY }}
   
   
 jobs: