diff --git a/.github/workflows/clean-pr-checks.yml b/.github/workflows/clean-pr-checks.yml
index c16078c9..54443b8b 100644
--- a/.github/workflows/clean-pr-checks.yml
+++ b/.github/workflows/clean-pr-checks.yml
@@ -76,9 +76,10 @@ jobs:
                 }
               }
             }
-          owner: ${{ inputs.owner }}
-          name: ${{ inputs.repo }}
-          pr: ${{ inputs.pr }}
+          variables: |
+            owner: ${{ inputs.owner }}
+            name: ${{ inputs.repo }}
+            pr: ${{ inputs.pr }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml
index 147ed172..c1a36e0c 100644
--- a/.github/workflows/o2-full-deps.yml
+++ b/.github/workflows/o2-full-deps.yml
@@ -95,7 +95,6 @@ jobs:
       fail-fast: false
       matrix:
         ubuntu_codename:
-          - bionic  # 18.04
           - focal   # 20.04
           - jammy   # 22.04
           - mantic  # 23.10
diff --git a/.github/workflows/pr-security-approval.yml b/.github/workflows/pr-security-approval.yml
index 3f452249..56f0232c 100644
--- a/.github/workflows/pr-security-approval.yml
+++ b/.github/workflows/pr-security-approval.yml
@@ -50,9 +50,10 @@ jobs:
                 }
               }
             }
-          owner: ${{ github.event.repository.owner.login }}
-          name: ${{ github.event.repository.name }}
-          pr: ${{ github.event.pull_request.number }}
+          variables: |
+            owner: ${{ github.event.repository.owner.login }}
+            name: ${{ github.event.repository.name }}
+            pr: ${{ github.event.pull_request.number }}
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}