diff --git a/conda/conda-build/meta.yaml b/conda/conda-build/meta.yaml
index f4cfbbba4..4cb76c552 100644
--- a/conda/conda-build/meta.yaml
+++ b/conda/conda-build/meta.yaml
@@ -50,9 +50,9 @@
 {% endif %}
 
 {% if not gpu_enabled_bool %}
-{% set cpu_tag='_cpu' %}
+{% set dev_tag='_cpu' %}
 {% else %}
-{% set cpu_tag='' %}
+{% set dev_tag='_gpu' %}
 {% endif %}
 
 {% if debug_build_bool %}
@@ -86,7 +86,7 @@ build:
   missing_dso_whitelist:
     -  '*libcuda.so*'
 
-  string: "cuda{{ cuda_major }}_py{{ py_version }}{{ git_describe_hash }}_{{ PKG_BUILDNUM }}{{ ucx_tag }}{{ cpu_tag }}{{ debug_tag }}"
+  string: "cuda{{ cuda_major }}_py{{ py_version }}{{ git_describe_hash }}_{{ PKG_BUILDNUM }}{{ ucx_tag }}{{ dev_tag }}{{ debug_tag }}"
 
   script_env:
     - SCCACHE_BUCKET
@@ -112,7 +112,7 @@ build:
 {% if not gpu_enabled_bool %}
     - {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }} =*_cpu
 {% else %}
-    - {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }}
+    - {{ pin_subpackage(name, min_pin="x.x.x", max_pin="x.x.x") }} =*_gpu
 {% endif %}
 {% if gpu_enabled_bool %}
 # prevent nccl from pulling in cudatoolkit
diff --git a/continuous_integration/scripts/build-legate b/continuous_integration/scripts/build-legate
index c38c6cf38..4112ffebd 100755
--- a/continuous_integration/scripts/build-legate
+++ b/continuous_integration/scripts/build-legate
@@ -80,6 +80,8 @@ build_legate() {
     activate_conda_env;
     conda_info;
 
+    git config --global --add safe.directory "$REPO_DIR/.git"
+
     case "$BUILD_TYPE" in
         ci) build_legate_ci && copy_ci_artifacts;;
         release) build_legate_release && copy_release_artifacts;;
@@ -88,4 +90,4 @@ build_legate() {
     esac
 }
 
-(build_legate "$@");
\ No newline at end of file
+(build_legate "$@");