diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index e087cf40..bacbea0e 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -41,11 +41,6 @@ on:
         required: false
         type: number
         default: 50
-      run_aws_end_to_end_test:
-        description: "Whether to run the AWS end to end tests, requiring AWS credentials."
-        required: false
-        type: boolean
-        default: false
 
 jobs:
   compile_and_test:
@@ -60,8 +55,8 @@ jobs:
       FLINK_CACHE_DIR: "/tmp/cache/flink"
       MVN_BUILD_OUTPUT_FILE: "/tmp/mvn_build_output.out"
       MVN_VALIDATION_DIR: "/tmp/flink-validation-deployment"
-      FLINK_AWS_USER: ${{ vars.FLINK_AWS_USER }}
-      FLINK_AWS_PASSWORD: ${{ vars.FLINK_AWS_PASSWORD }}
+      FLINK_AWS_USER: ${{ secrets.FLINK_AWS_USER }}
+      FLINK_AWS_PASSWORD: ${{ secrets.FLINK_AWS_PASSWORD }}
     steps:
       - run: echo "Running CI pipeline for JDK version ${{ matrix.jdk }}"
 
@@ -120,7 +115,7 @@ jobs:
           mvn clean
 
       - name: Run AWS e2e tests
-        if: ${{ inputs.run_aws_end_to_end_test }}
+        if: ${{ github.event_name == 'push' }}
         run: |
           set -o pipefail
 
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 2f4e365e..7084a921 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -31,4 +31,3 @@ jobs:
       flink_version: ${{ matrix.flink }}
       flink_url: https://s3.amazonaws.com/flink-nightly/flink-${{ matrix.flink }}-bin-scala_2.12.tgz
       cache_flink_binary: false
-      run_aws_end_to_end_test: true