diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
index 784d175f98..7760da8300 100644
--- a/.github/workflows/build-packages.yml
+++ b/.github/workflows/build-packages.yml
@@ -42,19 +42,19 @@ jobs:
 
           BUILD_NUMBER="${{ github.run_id }}"-ghactions
 
-          if [[ RELEASE_BUILD == "true" ]]; then 
+          if [[ "${RELEASE_BUILD}" == "true" ]]; then 
             BUILD_VERSION="${GITHUB_REF#/refs/tags/}";
-          elif [[ SNAPSHOT_BUILD == "true" ]]; then
+          elif [[ "${SNAPSHOT_BUILD}" == "true" ]]; then
             BUILD_VERSION="$(git describe --abbrev=0 --tags)"-1snapshot-"$(date '+%Y%m%dT%H%M')"-"$(echo ${GITHUB_SHA} | cut -c1-8)"; 
-          elif [[ PR_BUILD == "true" ]]; then 
+          elif [[ "${PR_BUILD}" == "true" ]]; then 
             BUILD_VERSION="$(git describe --abbrev=0 --tags)"-1branch-"${GITHUB_REF_NAME}";
           fi
 
-          echo "export RELEASE_BUILD=$RELEASE_BUILD";
-          echo "export RC_BUILD=$RC_BUILD";
-          echo "export SNAPSHOT_BUILD=$SNAPSHOT_BUILD";
-          echo "export BUILD_NUMBER=$BUILD_NUMBER";
-          echo "export BUILD_VERSION=$BUILD_VERSION";
+          echo "export RELEASE_BUILD=$RELEASE_BUILD;" >> build/env.sh
+          echo "export RC_BUILD=$RC_BUILD;" >> build/env.sh
+          echo "export SNAPSHOT_BUILD=$SNAPSHOT_BUILD;" >> build/env.sh
+          echo "export BUILD_NUMBER=$BUILD_NUMBER;" >> build/env.sh
+          echo "export BUILD_VERSION=$BUILD_VERSION;" >> build/env.sh
 
       # - name: Generate env file
       #   run: go run mage.go -v GenerateEnvFile
diff --git a/.github/workflows/tests-and-linters.yml b/.github/workflows/tests-and-linters.yml
index 1e1d6d26ba..798f8e7179 100644
--- a/.github/workflows/tests-and-linters.yml
+++ b/.github/workflows/tests-and-linters.yml
@@ -1,6 +1,7 @@
 name: Tests
-# on: 
+on: 
   # pull_request:
+  workflow_call:
 
 env:
   GOFLAGS: "-count=1"