diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f3e9f3..771d49c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,6 +19,9 @@ variables:
   DOCKER_CERT_PATH: $DOCKER_TLS_CERTDIR/client
   RUST_LOG_STYLE: always
   BB_SIGNING_DRIVER: sigstore
+  BB_BUILD_CHUNKED_OCI: 'true'
+  BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '128'
+  BB_BUILD_RECHUNK_CLEAR_PLAN: 'true'
   BB_BUILD_PUSH: 'true'
   CLICOLOR_FORCE: 1
   TAG: main
@@ -44,8 +47,6 @@ base-images:
   stage: base-images
   variables:
     BB_BUILD_CHUNKED_OCI_MAX_LAYERS: '64'
-    BB_BUILD_CHUNKED_OCI: 'true'
-    TAG: 704-sigstore-driver-doesnt-recursively-sign
   rules:
     # Run when any of the base recipes change
     - changes:
diff --git a/recipes/common/dev-packages.yml b/recipes/common/dev-packages.yml
index 41bd5a8..547d768 100644
--- a/recipes/common/dev-packages.yml
+++ b/recipes/common/dev-packages.yml
@@ -59,7 +59,6 @@ modules:
         - libxcb-devel
         - libinput-devel
         - mesa-libgbm-devel
-        - https://github.com/maxmind/geoip2-csv-converter/releases/download/v1.4.1/geoip2-csv-converter_1.4.1_linux_amd64.rpm
   - type: script
     scripts:
       - install-mkcert.sh