diff --git a/.github/workflows/pmm-package-test-runner.yml b/.github/workflows/pmm-package-test-runner.yml
index e8e91a940..29a27cbab 100644
--- a/.github/workflows/pmm-package-test-runner.yml
+++ b/.github/workflows/pmm-package-test-runner.yml
@@ -109,7 +109,7 @@ jobs:
       SHA: ${{ inputs.sha || 'null' }}
       PACKAGE_TESTING_BRANCH: ${{ inputs.package_testing_branch || 'master' }}
       PMM_SERVER_IMAGE: ${{ inputs.pmm_server_image }}
-      TARBALL: ${{ inputs.pmm_server_image || 'null' }}
+      TARBALL: ${{ inputs.pmm_client_tarball || 'null' }}
       EXPECTED_VERSION: ${{ inputs.expected_version }}
 
       REPO: ${{ inputs.repository || 'dev-latest' }}
@@ -253,7 +253,9 @@ jobs:
               export METRICS_MODE=${{ env.METRICS_MODE }}
               export PMM_VERSION="${{ env.EXPECTED_VERSION }}"
               export install_repo=${{ env.REPO }}
-              export tarball_link=${{ env.TARBALL }}
+              if [[ "${{ env.TARBALL }}" != "null" ]]; then
+                export tarball_link=${{ env.TARBALL }}
+              fi
                 
               if [[ "${{ env.VM_BOX }}" =~ "centos7" ]]; then
                 sudo yum install -y epel-release
diff --git a/playbooks/pmm2-client_integration_custom_path.yml b/playbooks/pmm2-client_integration_custom_path.yml
index 2f22757f0..a7efd7fd0 100644
--- a/playbooks/pmm2-client_integration_custom_path.yml
+++ b/playbooks/pmm2-client_integration_custom_path.yml
@@ -15,7 +15,7 @@
     pmm_version: "{{ lookup('env', 'PMM_VERSION') }}"
     pmm_repo: "{{ lookup('env', 'install_repo') }}"
     custom_path: "/pmm2-client-custom-path"
-    feature_build: "{{ lookup('env', 'feature_build') }}"
+    tarball_link: "{{ lookup('env', 'tarball_link') }}"
 
   tasks:
   - name: Register Instance IP