diff --git a/.github/workflows/scicat-fe.yml b/.github/workflows/scicat-fe.yml
index e1be811..a030d9f 100644
--- a/.github/workflows/scicat-fe.yml
+++ b/.github/workflows/scicat-fe.yml
@@ -24,7 +24,7 @@ jobs:
         frontend/**
 
   set_ci_vars:
-    if: needs.check_changed.outputs.changed == 'true'
+    if: (needs.check_changed.outputs.changed == 'true' && !needs.set_env.outputs.component) || needs.set_env.outputs.component == 'fe'
     runs-on: ubuntu-latest
     needs: 
       - check_changed
@@ -52,7 +52,7 @@ jobs:
         echo "::set-output name=ciVars::$(echo $ciVars)"
 
   build_deploy_scicat_fe:
-    if: needs.check_changed.outputs.changed == 'true'
+    if: (needs.check_changed.outputs.changed == 'true' && !needs.set_env.outputs.component) || needs.set_env.outputs.component == 'fe'
     needs: 
      - check_changed
      - set_env
diff --git a/.github/workflows/scicat-pan-ontologies-api.yml b/.github/workflows/scicat-pan-ontologies-api.yml
index 000ecec..4808ff2 100644
--- a/.github/workflows/scicat-pan-ontologies-api.yml
+++ b/.github/workflows/scicat-pan-ontologies-api.yml
@@ -38,3 +38,4 @@ jobs:
     secrets:
       KUBECONFIG: ${{ secrets.KUBECONFIG }}
       JSON_SECRETS: ${{ toJSON(secrets) }}
+