diff --git a/.circleci/base_config.yml b/.circleci/base_config.yml
index 634a3c29b..9c1e6c7ff 100644
--- a/.circleci/base_config.yml
+++ b/.circleci/base_config.yml
@@ -10,6 +10,7 @@ executors:
     docker:
       - image: cimg/python:3.10.4
         user: root
+    resource_class: large
   machine-executor:
     machine:
       docker_layer_caching: false
diff --git a/scripts/build-and-tag-images.sh b/scripts/build-and-tag-images.sh
index b35744967..a59177fa7 100755
--- a/scripts/build-and-tag-images.sh
+++ b/scripts/build-and-tag-images.sh
@@ -15,7 +15,7 @@ COMMIT_HASH=$6
 DOCKER_LOGIN=$7
 DOCKER_USER=$8
 BUILD_DATE=`date +%F`
-TAG="${BUILD_DATE}_build-${BUILD_NUM}_${COMMIT_HASH}"
+TAG="${BUILD_DATE}_build#${BUILD_NUM}_${COMMIT_HASH}"
 
 export DOCKER_CLI_EXPERIMENTAL=enabled