diff --git a/.github/workflows/runtime-interface-client_merge_to_main.yml b/.github/workflows/runtime-interface-client_merge_to_main.yml
index 8dd3b817..7db9d1aa 100644
--- a/.github/workflows/runtime-interface-client_merge_to_main.yml
+++ b/.github/workflows/runtime-interface-client_merge_to_main.yml
@@ -15,6 +15,7 @@ on:
     branches: [ main ]
     paths:
     - 'aws-lambda-java-runtime-interface-client/**'
+    - '.github/workflows/runtime-interface-client_*.yml'
   workflow_dispatch:
 
 jobs:
@@ -53,6 +54,9 @@ jobs:
         IS_JAVA_8: true
 
     - name: Issue AWS credentials
+      if: env.ENABLE_SNAPSHOT != null
+      env:
+        ENABLE_SNAPSHOT: ${{ secrets.ENABLE_SNAPSHOT }}
       uses: aws-actions/configure-aws-credentials@v4
       with:
         aws-region: ${{ secrets.AWS_REGION }}
@@ -61,6 +65,9 @@ jobs:
         role-duration-seconds: 900
 
     - name: Prepare codeartifact properties
+      if: env.ENABLE_SNAPSHOT != null
+      env:
+        ENABLE_SNAPSHOT: ${{ secrets.ENABLE_SNAPSHOT }}
       working-directory: ./aws-lambda-java-runtime-interface-client/ric-dev-environment
       run: |
         cat <<EOF > codeartifact-properties.mk
@@ -71,7 +78,14 @@ jobs:
         EOF
 
     - name: Publish
+      if: env.ENABLE_SNAPSHOT != null
       working-directory: ./aws-lambda-java-runtime-interface-client
       env:
         ENABLE_SNAPSHOT: ${{ secrets.ENABLE_SNAPSHOT }}
       run: make publish
+
+    - name: Upload coverage to Codecov
+      if: env.CODECOV_TOKEN != null
+      uses: codecov/codecov-action@v4
+      env:
+        CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
diff --git a/.github/workflows/runtime-interface-client_pr.yml b/.github/workflows/runtime-interface-client_pr.yml
index 654dd6c9..35a3334b 100644
--- a/.github/workflows/runtime-interface-client_pr.yml
+++ b/.github/workflows/runtime-interface-client_pr.yml
@@ -8,7 +8,7 @@ on:
     branches: [ '*' ]
     paths:
       - 'aws-lambda-java-runtime-interface-client/**'
-      - '.github/workflows/runtime-interface-client_pr.yml'
+      - '.github/workflows/runtime-interface-client_*.yml'
 
 jobs:
 
@@ -50,13 +50,13 @@ jobs:
 
     - name: Available buildx platforms
       run: echo ${{ steps.buildx.outputs.platforms }}
-          
+
     - name: Test Runtime Interface Client xplatform build - Run 'build' target
       working-directory: ./aws-lambda-java-runtime-interface-client
       run: make build
       env:
         IS_JAVA_8: true
-      
+
     - name: Save the built jar
       uses: actions/upload-artifact@v4
       with:
@@ -64,6 +64,7 @@ jobs:
         path: ./aws-lambda-java-runtime-interface-client/target/aws-lambda-java-runtime-interface-client-*.jar
 
     - name: Upload coverage to Codecov
+      if: env.CODECOV_TOKEN != null
       uses: codecov/codecov-action@v4
       env:
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}