diff --git a/withdrawn-packages.txt b/withdrawn-packages.txt
index 5fd5c322f6c..19fffe11274 100644
--- a/withdrawn-packages.txt
+++ b/withdrawn-packages.txt
@@ -1,227 +1,2 @@
-glibc-2.41-r0.apk
-glibc-dev-2.41-r0.apk
-glibc-iconv-2.41-r0.apk
-glibc-locale-aa-2.41-r0.apk
-glibc-locale-af-2.41-r0.apk
-glibc-locale-agr-2.41-r0.apk
-glibc-locale-ak-2.41-r0.apk
-glibc-locale-am-2.41-r0.apk
-glibc-locale-an-2.41-r0.apk
-glibc-locale-anp-2.41-r0.apk
-glibc-locale-ar-2.41-r0.apk
-glibc-locale-as-2.41-r0.apk
-glibc-locale-ast-2.41-r0.apk
-glibc-locale-ayc-2.41-r0.apk
-glibc-locale-az-2.41-r0.apk
-glibc-locale-be-2.41-r0.apk
-glibc-locale-bem-2.41-r0.apk
-glibc-locale-ber-2.41-r0.apk
-glibc-locale-bg-2.41-r0.apk
-glibc-locale-bhb-2.41-r0.apk
-glibc-locale-bho-2.41-r0.apk
-glibc-locale-bi-2.41-r0.apk
-glibc-locale-bn-2.41-r0.apk
-glibc-locale-bo-2.41-r0.apk
-glibc-locale-br-2.41-r0.apk
-glibc-locale-brx-2.41-r0.apk
-glibc-locale-bs-2.41-r0.apk
-glibc-locale-byn-2.41-r0.apk
-glibc-locale-ca-2.41-r0.apk
-glibc-locale-ce-2.41-r0.apk
-glibc-locale-chr-2.41-r0.apk
-glibc-locale-ckb-2.41-r0.apk
-glibc-locale-cmn-2.41-r0.apk
-glibc-locale-crh-2.41-r0.apk
-glibc-locale-cs-2.41-r0.apk
-glibc-locale-csb-2.41-r0.apk
-glibc-locale-cv-2.41-r0.apk
-glibc-locale-cy-2.41-r0.apk
-glibc-locale-da-2.41-r0.apk
-glibc-locale-de-2.41-r0.apk
-glibc-locale-doi-2.41-r0.apk
-glibc-locale-dsb-2.41-r0.apk
-glibc-locale-dv-2.41-r0.apk
-glibc-locale-dz-2.41-r0.apk
-glibc-locale-el-2.41-r0.apk
-glibc-locale-en-2.41-r0.apk
-glibc-locale-eo-2.41-r0.apk
-glibc-locale-es-2.41-r0.apk
-glibc-locale-et-2.41-r0.apk
-glibc-locale-eu-2.41-r0.apk
-glibc-locale-fa-2.41-r0.apk
-glibc-locale-ff-2.41-r0.apk
-glibc-locale-fi-2.41-r0.apk
-glibc-locale-fil-2.41-r0.apk
-glibc-locale-fo-2.41-r0.apk
-glibc-locale-fr-2.41-r0.apk
-glibc-locale-fur-2.41-r0.apk
-glibc-locale-fy-2.41-r0.apk
-glibc-locale-ga-2.41-r0.apk
-glibc-locale-gbm-2.41-r0.apk
-glibc-locale-gd-2.41-r0.apk
-glibc-locale-gez-2.41-r0.apk
-glibc-locale-gl-2.41-r0.apk
-glibc-locale-gu-2.41-r0.apk
-glibc-locale-gv-2.41-r0.apk
-glibc-locale-ha-2.41-r0.apk
-glibc-locale-hak-2.41-r0.apk
-glibc-locale-he-2.41-r0.apk
-glibc-locale-hi-2.41-r0.apk
-glibc-locale-hif-2.41-r0.apk
-glibc-locale-hne-2.41-r0.apk
-glibc-locale-hr-2.41-r0.apk
-glibc-locale-hsb-2.41-r0.apk
-glibc-locale-ht-2.41-r0.apk
-glibc-locale-hu-2.41-r0.apk
-glibc-locale-hy-2.41-r0.apk
-glibc-locale-ia-2.41-r0.apk
-glibc-locale-id-2.41-r0.apk
-glibc-locale-ig-2.41-r0.apk
-glibc-locale-ik-2.41-r0.apk
-glibc-locale-is-2.41-r0.apk
-glibc-locale-it-2.41-r0.apk
-glibc-locale-iu-2.41-r0.apk
-glibc-locale-ja-2.41-r0.apk
-glibc-locale-ka-2.41-r0.apk
-glibc-locale-kab-2.41-r0.apk
-glibc-locale-kk-2.41-r0.apk
-glibc-locale-kl-2.41-r0.apk
-glibc-locale-km-2.41-r0.apk
-glibc-locale-kn-2.41-r0.apk
-glibc-locale-ko-2.41-r0.apk
-glibc-locale-kok-2.41-r0.apk
-glibc-locale-ks-2.41-r0.apk
-glibc-locale-ku-2.41-r0.apk
-glibc-locale-kv-2.41-r0.apk
-glibc-locale-kw-2.41-r0.apk
-glibc-locale-ky-2.41-r0.apk
-glibc-locale-lb-2.41-r0.apk
-glibc-locale-lg-2.41-r0.apk
-glibc-locale-li-2.41-r0.apk
-glibc-locale-lij-2.41-r0.apk
-glibc-locale-ln-2.41-r0.apk
-glibc-locale-lo-2.41-r0.apk
-glibc-locale-lt-2.41-r0.apk
-glibc-locale-ltg-2.41-r0.apk
-glibc-locale-lv-2.41-r0.apk
-glibc-locale-lzh-2.41-r0.apk
-glibc-locale-mag-2.41-r0.apk
-glibc-locale-mai-2.41-r0.apk
-glibc-locale-mdf-2.41-r0.apk
-glibc-locale-mfe-2.41-r0.apk
-glibc-locale-mg-2.41-r0.apk
-glibc-locale-mhr-2.41-r0.apk
-glibc-locale-mi-2.41-r0.apk
-glibc-locale-miq-2.41-r0.apk
-glibc-locale-mjw-2.41-r0.apk
-glibc-locale-mk-2.41-r0.apk
-glibc-locale-ml-2.41-r0.apk
-glibc-locale-mn-2.41-r0.apk
-glibc-locale-mni-2.41-r0.apk
-glibc-locale-mnw-2.41-r0.apk
-glibc-locale-mr-2.41-r0.apk
-glibc-locale-ms-2.41-r0.apk
-glibc-locale-mt-2.41-r0.apk
-glibc-locale-my-2.41-r0.apk
-glibc-locale-nan-2.41-r0.apk
-glibc-locale-nb-2.41-r0.apk
-glibc-locale-nds-2.41-r0.apk
-glibc-locale-ne-2.41-r0.apk
-glibc-locale-nhn-2.41-r0.apk
-glibc-locale-niu-2.41-r0.apk
-glibc-locale-nl-2.41-r0.apk
-glibc-locale-nn-2.41-r0.apk
-glibc-locale-nr-2.41-r0.apk
-glibc-locale-nso-2.41-r0.apk
-glibc-locale-oc-2.41-r0.apk
-glibc-locale-om-2.41-r0.apk
-glibc-locale-or-2.41-r0.apk
-glibc-locale-os-2.41-r0.apk
-glibc-locale-pa-2.41-r0.apk
-glibc-locale-pap-2.41-r0.apk
-glibc-locale-pl-2.41-r0.apk
-glibc-locale-posix-2.41-r0.apk
-glibc-locale-ps-2.41-r0.apk
-glibc-locale-pt-2.41-r0.apk
-glibc-locale-quz-2.41-r0.apk
-glibc-locale-raj-2.41-r0.apk
-glibc-locale-rif-2.41-r0.apk
-glibc-locale-ro-2.41-r0.apk
-glibc-locale-ru-2.41-r0.apk
-glibc-locale-rw-2.41-r0.apk
-glibc-locales-2.41-r0.apk
-glibc-locale-sa-2.41-r0.apk
-glibc-locale-sah-2.41-r0.apk
-glibc-locale-sat-2.41-r0.apk
-glibc-locale-sc-2.41-r0.apk
-glibc-locale-scn-2.41-r0.apk
-glibc-locale-sd-2.41-r0.apk
-glibc-locale-se-2.41-r0.apk
-glibc-locale-sgs-2.41-r0.apk
-glibc-locale-shn-2.41-r0.apk
-glibc-locale-shs-2.41-r0.apk
-glibc-locale-si-2.41-r0.apk
-glibc-locale-sid-2.41-r0.apk
-glibc-locale-sk-2.41-r0.apk
-glibc-locale-sl-2.41-r0.apk
-glibc-locale-sm-2.41-r0.apk
-glibc-locale-so-2.41-r0.apk
-glibc-locale-sq-2.41-r0.apk
-glibc-locale-sr-2.41-r0.apk
-glibc-locale-ss-2.41-r0.apk
-glibc-locale-ssy-2.41-r0.apk
-glibc-locale-st-2.41-r0.apk
-glibc-locale-su-2.41-r0.apk
-glibc-locale-sv-2.41-r0.apk
-glibc-locale-sw-2.41-r0.apk
-glibc-locale-syr-2.41-r0.apk
-glibc-locale-szl-2.41-r0.apk
-glibc-locale-ta-2.41-r0.apk
-glibc-locale-tcy-2.41-r0.apk
-glibc-locale-te-2.41-r0.apk
-glibc-locale-tg-2.41-r0.apk
-glibc-locale-th-2.41-r0.apk
-glibc-locale-the-2.41-r0.apk
-glibc-locale-ti-2.41-r0.apk
-glibc-locale-tig-2.41-r0.apk
-glibc-locale-tk-2.41-r0.apk
-glibc-locale-tl-2.41-r0.apk
-glibc-locale-tn-2.41-r0.apk
-glibc-locale-to-2.41-r0.apk
-glibc-locale-tok-2.41-r0.apk
-glibc-locale-tpi-2.41-r0.apk
-glibc-locale-tr-2.41-r0.apk
-glibc-locale-ts-2.41-r0.apk
-glibc-locale-tt-2.41-r0.apk
-glibc-locale-ug-2.41-r0.apk
-glibc-locale-uk-2.41-r0.apk
-glibc-locale-unm-2.41-r0.apk
-glibc-locale-ur-2.41-r0.apk
-glibc-locale-uz-2.41-r0.apk
-glibc-locale-ve-2.41-r0.apk
-glibc-locale-vi-2.41-r0.apk
-glibc-locale-wa-2.41-r0.apk
-glibc-locale-wae-2.41-r0.apk
-glibc-locale-wal-2.41-r0.apk
-glibc-locale-wo-2.41-r0.apk
-glibc-locale-xh-2.41-r0.apk
-glibc-locale-yi-2.41-r0.apk
-glibc-locale-yo-2.41-r0.apk
-glibc-locale-yue-2.41-r0.apk
-glibc-locale-yuw-2.41-r0.apk
-glibc-locale-zgh-2.41-r0.apk
-glibc-locale-zh-2.41-r0.apk
-glibc-locale-zu-2.41-r0.apk
-glibc-tracing-2.41-r0.apk
-ld-linux-2.41-r0.apk
-libc-bin-2.41-r0.apk
-libcrypt1-2.41-r0.apk
-localedef-2.41-r0.apk
-nscd-2.41-r0.apk
-nss-db-2.41-r0.apk
-nss-hesiod-2.41-r0.apk
-pcprofiledump-2.41-r0.apk
-posix-libc-utils-2.41-r0.apk
-sln-2.41-r0.apk
-sotruss-2.41-r0.apk
-tzutils-2.41-r0.apk
+zetasql-2024.06.1-r2.apk
+zetasql-dev-2024.06.1-r2.apk
diff --git a/zetasql.yaml b/zetasql.yaml
deleted file mode 100644
index d8b46596b6f..00000000000
--- a/zetasql.yaml
+++ /dev/null
@@ -1,64 +0,0 @@
-package:
-  name: zetasql
-  version: 2024.06.1
-  epoch: 2
-  description: ZetaSQL - Analyzer Framework for SQL
-  copyright:
-    - license: Apache-2.0
-  resources:
-    cpu: 33
-    memory: 100Gi
-
-environment:
-  contents:
-    packages:
-      - bash
-      - bazel-6
-      - binutils
-      - build-base
-      - busybox
-      - ca-certificates-bundle
-      - gcc-12
-      - git
-      - openjdk-17-default-jdk
-      - patch
-      - python3
-      - tzdata
-      - wolfi-baselayout
-  environment:
-    BAZEL_ARGS: "--config=g++"
-    EXTRA_BAZEL_ARGS: "--tool_java_runtime_version=local_jdk"
-    JAVA_HOME: /usr/lib/jvm/java-17-openjdk
-
-pipeline:
-  - uses: git-checkout
-    with:
-      repository: https://github.com/google/zetasql
-      tag: ${{package.version}}
-      expected-commit: f6df6971a205790966e73eda0134f05a022d0e6a
-
-  - 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
-
-  - uses: strip
-
-subpackages:
-  - name: ${{package.name}}-dev
-    description: ${{package.name}} dev
-    pipeline:
-      - uses: split/dev
-    dependencies:
-      runtime:
-        - zetasql
-
-update:
-  enabled: true
-  github:
-    identifier: google/zetasql
-    use-tag: true
diff --git a/zetasql/multi-arch-for-linux.patch b/zetasql/multi-arch-for-linux.patch
deleted file mode 100644
index 75be71f4269..00000000000
--- a/zetasql/multi-arch-for-linux.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff --git a/java/com/google/zetasql/BUILD b/java/com/google/zetasql/BUILD
-index dec4bef..3bd4fab 100644
---- a/java/com/google/zetasql/BUILD
-+++ b/java/com/google/zetasql/BUILD
-@@ -198,7 +198,7 @@ javadoc_library(
- java_library(
-     name = "jni_channel_linux",
-     resources = select({
--        "@bazel_tools//src/conditions:linux_x86_64": ["//zetasql/local_service:liblocal_service_jni.so"],
-+        "@bazel_tools//src/conditions:linux": ["//zetasql/local_service:liblocal_service_jni.so"],
-         "//conditions:default": [],
-     }),
-     tags = ["maven_coordinates=com.google.zetasql:zetasql-jni-channel-linux:${project.version}"],
-diff --git a/zetasql/jdk/BUILD b/zetasql/jdk/BUILD
-index 56c30f5..41b5235 100644
---- a/zetasql/jdk/BUILD
-+++ b/zetasql/jdk/BUILD
-@@ -25,13 +25,13 @@ cc_library(
-         "@local_jdk//:jni_header",
-     ] + select({
-         "@bazel_tools//src/conditions:darwin": ["@local_jdk//:jni_md_header-darwin"],
--        "@bazel_tools//src/conditions:linux_x86_64": ["@local_jdk//:jni_md_header-linux"],
-+        "@bazel_tools//src/conditions:linux": ["@local_jdk//:jni_md_header-linux"],
-     }),
-     includes = [
-         "../../external/local_jdk/include",
-     ] + select({
-         "@bazel_tools//src/conditions:darwin": ["../../external/local_jdk/include/darwin"],
--        "@bazel_tools//src/conditions:linux_x86_64": ["../../external/local_jdk/include/linux"],
-+        "@bazel_tools//src/conditions:linux": ["../../external/local_jdk/include/linux"],
-     }),
-     linkstatic = 1,
- )
\ No newline at end of file