diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
index f7fe2fae1c..0c4531da77 100644
--- a/.github/workflows/build_and_test.yml
+++ b/.github/workflows/build_and_test.yml
@@ -921,6 +921,9 @@ jobs:
     #   (github.ref_name == 'main' || github.ref_name == 'release') &&
     #    github.event_name != 'workflow_dispatch'
     runs-on: ${{ github.ref_name == 'release' && fromJSON('["self-hosted", "prod", "x64"]') || fromJSON('["self-hosted", "gen3", "small"]') }}
+    container:
+      image: 369495373322.dkr.ecr.eu-central-1.amazonaws.com/rust:pinned
+      options: --init
     needs: [ tag, promote-images ]
     strategy:
       fail-fast: false
diff --git a/scripts/combine_control_files.py b/scripts/combine_control_files.py
index c30871af42..d10b69eeba 100644
--- a/scripts/combine_control_files.py
+++ b/scripts/combine_control_files.py
@@ -2,7 +2,10 @@ import json
 import os
 
 # enable custom extensions for specific tenants
-enabled_extensions = {"123454321": ["anon"]}
+enabled_extensions = {
+    "123454321": ["anon"],
+    "public": ["embedding"]
+}
 
 control_data = {}
 for control_file in os.listdir("control_files"):