diff --git a/.github/workflows/deploy-k8s.yml b/.github/workflows/deploy-k8s.yml
index 9165e78..c8ff0bd 100644
--- a/.github/workflows/deploy-k8s.yml
+++ b/.github/workflows/deploy-k8s.yml
@@ -68,7 +68,8 @@ jobs:
         run: |
             cat .github/workflows/ci-properties.json
             for i in `cat .github/workflows/ci-properties.json | jq -r .APP_ENV_VARS | jq -r 'keys[]' || true`; do params="${params} --from-literal=$i=$(cat .github/workflows/ci-properties.json | jq -r .APP_ENV_VARS.$i)"; done
-            for i in `cat .github/workflows/ci-properties.json | jq -r .${{inputs.ci_env}}_ENV_VARS | jq -r 'keys[]' || true`; do params="${params} --from-literal=$i=$(cat .github/workflows/ci-properties.json | jq -r .${{inputs.ci_env}}_ENV_VARS.$i)"; done
+            echo "result: ${{ inputs.ci_env }}_ENV_VARS"
+            for i in `cat .github/workflows/ci-properties.json | jq -r .${{ inputs.ci_env }}_ENV_VARS | jq -r 'keys[]' || true`; do params="${params} --from-literal=$i=$(cat .github/workflows/ci-properties.json | jq -r .${{ inputs.ci_env }}_ENV_VARS.$i)"; done
             echo "ENV VARS from ci-properties.json: $params"
             echo "::set-output name=k8sparams::$params"
        
diff --git a/.github/workflows/init.yml b/.github/workflows/init.yml
index 789cb12..133422c 100644
--- a/.github/workflows/init.yml
+++ b/.github/workflows/init.yml
@@ -31,6 +31,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       k8s_namespace: ${{ steps.setvars.outputs.k8s_namespace }}
+      ci_env: ${{ steps.setvars.outputs.ci_env }}
       image_name: ${{ steps.setvars.outputs.image_name }}
       registry: ${{ steps.setvars.outputs.registry }}
       aws_region: ${{ steps.setvars.outputs.aws_region }}
@@ -45,8 +46,8 @@ jobs:
         shell: bash
         run: |
            for i in `cat .github/workflows/ci-properties.json | jq -r 'keys[]'`; do
-               if [[ $i != "APP_ENV_VARS" ]]; then
-                 echo "$i=$( cat .github/workflows/ci-properties.json | jq -r .$i)" >> $GITHUB_ENV
+               if [[ $i != "APP_ENV_VARS" && $i != "DEV_ENV_VARS" && $i != "PROD_ENV_VARS" ]]; then
+                   echo "$i=$( cat .github/workflows/ci-properties.json | jq -r .$i)" >> $GITHUB_ENV
                fi
            done;