diff --git a/transport-interop/dockerBuildWrapper.sh b/transport-interop/dockerBuildWrapper.sh
index 087a4e8c9..baa257b89 100755
--- a/transport-interop/dockerBuildWrapper.sh
+++ b/transport-interop/dockerBuildWrapper.sh
@@ -3,11 +3,15 @@
 CACHING_OPTIONS=""
 # If in CI and we have a defined cache bucket, use caching
 if [[ -n "${CI}" ]] && [[ -n "${AWS_BUCKET}" ]]; then
-    CACHING_OPTIONS="\
-        --cache-to   type=s3,mode=max,bucket=$AWS_BUCKET,region=$AWS_REGION,prefix=buildCache,name=$IMAGE_NAME \
-        --cache-from type=s3,mode=max,bucket=$AWS_BUCKET,region=$AWS_REGION,prefix=buildCache,name=$IMAGE_NAME"
+    # CACHING_OPTIONS="\
+    #     --cache-to   type=s3,mode=max,bucket=$AWS_BUCKET,region=$AWS_REGION,prefix=buildCache,name=$IMAGE_NAME \
+    #     --cache-from type=s3,mode=max,bucket=$AWS_BUCKET,region=$AWS_REGION,prefix=buildCache,name=$IMAGE_NAME"
 fi
 
+CACHING_OPTIONS="\
+        --cache-to   type=gha,mode=max \
+        --cache-from type=gha,mode=max"
+
 docker buildx build \
     --load \
     -t $IMAGE_NAME $CACHING_OPTIONS "$@"