diff --git a/.github/workflows/functional_test_v2.yaml b/.github/workflows/functional_test_v2.yaml
index 429285054d..639405c952 100644
--- a/.github/workflows/functional_test_v2.yaml
+++ b/.github/workflows/functional_test_v2.yaml
@@ -131,6 +131,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-1
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
           aws eks update-kubeconfig --name rotel-eks --region us-west-1
@@ -170,6 +171,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-1
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
           aws eks update-kubeconfig --name rotel-eks --region us-west-1
@@ -179,7 +181,7 @@ jobs:
       - name: run functional tests
         env:
           HOST_ENDPOINT: 0.0.0.0
-          UPGRADE_FROM_VALUES: aws_upgrade_from_previous_release_values.yaml
+          UPGRADE_FROM_VALUES: eks_upgrade_from_previous_release_values.yaml
           UPGRADE_FROM_CHART_DIR: base/splunk-otel-collector
         run: |
           TEARDOWN_BEFORE_SETUP=true SUITE=functional make functionaltest
@@ -396,9 +398,10 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-2
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
-          aws eks update-kubeconfig --name github-gdi-fargate --region us-west-2
+          aws eks update-kubeconfig --name gdi-github-eks-fargate --region us-west-2
       - name: Update dependencies
         run: |
           make dep-update
@@ -436,9 +439,10 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-2
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
-          aws eks update-kubeconfig --name github-gdi-fargate --region us-west-2
+          aws eks update-kubeconfig --name gdi-github-eks-fargate --region us-west-2
       - name: Update dependencies
         run: |
           make dep-update
@@ -472,6 +476,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-2
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
           aws eks update-kubeconfig --name rotel-eks-autotest --region us-west-2
@@ -511,6 +516,7 @@ jobs:
           aws-access-key-id: ${{ secrets.AWS_KEY }}
           aws-secret-access-key: ${{ secrets.AWS_SECRET }}
           aws-region: us-west-2
+          mask-aws-account-id: true
       - name: Install kubeconfig
         run: |
           aws eks update-kubeconfig --name rotel-eks-autotest --region us-west-2
diff --git a/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl b/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl
index 3e6758d3c4..d870bfbc27 100644
--- a/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl
+++ b/functional_tests/functional/testdata/values/eks_test_values.yaml.tmpl
@@ -19,6 +19,18 @@ logsCollection:
     useHostJournalctl: true
     enabled: true
     directory: /var/log/journal
+    # EKS nodes run Amazon Linux 2023, where a required shared library for journalctl
+    # lives under /usr/lib64. The chart's default mnts only mount /lib64, /lib and
+    # /usr/lib, so journalctl fails to start unless /usr/lib64 is mounted as well.
+    mnts:
+      - name: host-lib64
+        path: /lib64
+      - name: host-lib
+        path: /lib
+      - name: host-usr-lib
+        path: /usr/lib
+      - name: host-usr-lib64
+        path: /usr/lib64
     units:
       - name: kubelet
         priority: info
@@ -47,6 +59,7 @@ agent:
           exporters:
             - otlp_grpc
 clusterReceiver:
+  hostNetwork: true
   eventsEnabled: true
   config:
     exporters:
diff --git a/functional_tests/functional/testdata/values/aws_upgrade_from_previous_release_values.yaml b/functional_tests/functional/testdata/values/eks_upgrade_from_previous_release_values.yaml
similarity index 85%
rename from functional_tests/functional/testdata/values/aws_upgrade_from_previous_release_values.yaml
rename to functional_tests/functional/testdata/values/eks_upgrade_from_previous_release_values.yaml
index db615df3fd..0b8a13dc39 100644
--- a/functional_tests/functional/testdata/values/aws_upgrade_from_previous_release_values.yaml
+++ b/functional_tests/functional/testdata/values/eks_upgrade_from_previous_release_values.yaml
@@ -1,9 +1,11 @@
 cloudProvider: aws
-distribution: eks
 environment: dev
 splunkObservability:
   realm: us0
   accessToken: xxxxx
+distribution: eks
+clusterReceiver:
+  hostNetwork: true
 operatorcrds:
   install: true
 operator: