diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b7ce06f..94b7bbb 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,3 +24,22 @@ jobs:
           curl -SL https://github.com/docker/compose/releases/download/v2.0.0/docker-compose-linux-amd64 -o ~/.docker/cli-plugins/docker-compose
           chmod +x ~/.docker/cli-plugins/docker-compose
       - run: make test
+
+  test-jaeger-grpc-integration:
+    name: test-jaeger-grpc-integration
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+    steps:
+      - uses: actions/checkout@v2
+      - name: Configure AWS credentials from CI account
+        uses: aws-actions/configure-aws-credentials@v1
+        with:
+          role-to-assume: arn:aws:iam::962548656022:role/jaeger-s3-ci
+          aws-region: us-east-1
+      - run: |
+          mkdir -p ~/.docker/cli-plugins/
+          curl -SL https://github.com/docker/compose/releases/download/v2.0.0/docker-compose-linux-amd64 -o ~/.docker/cli-plugins/docker-compose
+          chmod +x ~/.docker/cli-plugins/docker-compose
+      - run: make test-jaeger-grpc-integration
diff --git a/.gitignore b/.gitignore
index 1ff8869..e69de29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +0,0 @@
-test-config.yml
diff --git a/Dockerfile b/Dockerfile
index e2c569a..cb271cb 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@ FROM code AS test
 
 FROM base AS jaeger-grpc-integration
 ARG GOARCH=amd64
-RUN git clone --depth=1 --single-branch --branch=main https://github.com/jaegertracing/jaeger.git /jaeger
+RUN git clone --depth=1 --single-branch --branch=no-future https://github.com/johanneswuerbach/jaeger.git /jaeger
 WORKDIR /jaeger
 COPY --from=build /src/s3-plugin /go/bin
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 9715348..22cfd9b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -51,6 +51,9 @@ services:
       - STORAGE=grpc-plugin
       - AWS_PROFILE
       - AWS_REGION
+      - AWS_ACCESS_KEY_ID
+      - AWS_SECRET_ACCESS_KEY
+      - AWS_SESSION_TOKEN
     volumes:
       - ~/.aws:/root/.aws
       - int-mod-cache:/go/pkg/mod
diff --git a/test-config.yml b/test-config.yml
new file mode 100644
index 0000000..6597f14
--- /dev/null
+++ b/test-config.yml
@@ -0,0 +1,13 @@
+s3:
+  bucketName: jaeger-s3-test
+  prefix: spans/
+  bufferDuration: 1s
+  emptyBucket: true
+athena:
+  databaseName: default
+  tableName: jaeger
+  outputLocation: s3://jaeger-s3-test-results/
+  workGroup: jaeger
+  maxSpanAge: 336h
+  dependenciesQueryTtl: 6h
+  servicesQueryTtl: 10s