diff --git a/zetasql.yaml b/zetasql.yaml
index 390083a0ff5..1430ff20ee9 100644
--- a/zetasql.yaml
+++ b/zetasql.yaml
@@ -1,7 +1,7 @@
 package:
   name: zetasql
-  version: 2024.06.1
-  epoch: 2
+  version: 2024.08.2
+  epoch: 0
   description: ZetaSQL - Analyzer Framework for SQL
   copyright:
     - license: Apache-2.0
@@ -18,8 +18,10 @@ environment:
       - build-base
       - busybox
       - ca-certificates-bundle
-      - gcc-12
+      - cmake
+      - gcc-12-default
       - git
+      - glibc-locale-en # This fixes the build failure with UTF-8 filenames, see wolfi-dev/os#26865
       - openjdk-17
       - openjdk-17-default-jvm
       - openssf-compiler-options
@@ -28,25 +30,41 @@ environment:
       - tzdata
       - wolfi-baselayout
   environment:
-    BAZEL_ARGS: "--config=g++"
-    EXTRA_BAZEL_ARGS: "--tool_java_runtime_version=local_jdk"
+    BAZEL_ARGS: "--config=g++ --cxxopt=-std=c++17 --host_cxxopt=-std=c++17 --tool_java_runtime_version=local_jdk"
     JAVA_HOME: /usr/lib/jvm/java-17-openjdk
+    LANG: en_US.UTF-8
+    CC: gcc
+    CXX: g++
 
 pipeline:
   - uses: git-checkout
     with:
       repository: https://github.com/google/zetasql
       tag: ${{package.version}}
-      expected-commit: f6df6971a205790966e73eda0134f05a022d0e6a
+      expected-commit: 194cd32b5d766d60e3ca442651d792c7fe54ea74
 
   - uses: patch
     with:
       patches: multi-arch-for-linux.patch
 
   - runs: |
-      cd zetasql
-      bazel build --verbose_failures ${BAZEL_ARGS} $EXTRA_BAZEL_ARGS -c opt ...
-      # TODO need to copy whats required after this from either bazel-bin or bazel-out
+      # odd permisson issue with bazel cache DONT MERGE UNTIL FIGURED OUT
+      mkdir -p .cache/bazel/_bazel_root
+      chmod -R 755 .cache/bazel/_bazel_root
+
+      # DONT MERGE UNTIL FIGURED OUT
+      attempt=1
+      while [ $attempt -le 15 ]; do
+        echo "Attempt $attempt of 10..."
+        if bazel build --verbose_failures $BAZEL_ARGS -c opt zetasql/...; then
+          echo "Build succeeded on attempt $attempt!"
+          break
+        fi
+        echo "Build failed on attempt $attempt"
+        attempt=$(( attempt + 1 ))
+        [ $attempt -le 15 ] && sleep 2
+      done
+      [ $attempt -le 15 ] || exit 1
 
   - uses: strip