diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef68cd6881080097bb8b99a7cc0b3122fe8d3cd3..08d2fd54702d999c7f9313c026cb643df434e33a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -62,6 +62,7 @@ build carta envoy:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/carta_envoy"
+    PACKAGE_NAME: "carta_envoy"
   extends: .build-package
 
 build casa envoy:
@@ -69,6 +70,7 @@ build casa envoy:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/casa_envoy"
+    PACKAGE_NAME: "casa_envoy"
   extends: .build-package
 
 build core sampler:
@@ -76,6 +78,7 @@ build core sampler:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/utilities/core_sampler"
+    PACKAGE_NAME: "core_sampler"
   extends: .build-package
 
 build conveyor:
@@ -83,6 +86,7 @@ build conveyor:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/conveyor"
+    PACKAGE_NAME: "conveyor"
   extends: .build-package
 
 build data annotator:
@@ -90,6 +94,7 @@ build data annotator:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/data_annotator"
+    PACKAGE_NAME: "data_annotator"
   extends: .build-package
 
 build deliver:
@@ -97,6 +102,7 @@ build deliver:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/deliver"
+    PACKAGE_NAME: "deliver"
   extends: .build-package
 
 build ingest envoy:
@@ -104,6 +110,7 @@ build ingest envoy:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/ingest_envoy"
+    PACKAGE_NAME: "ingest_envoy"
   extends: .build-package
 
 build mediator:
@@ -111,6 +118,7 @@ build mediator:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/mediator"
+    PACKAGE_NAME: "mediator"
   extends: .build-package
 
 build null:
@@ -118,6 +126,7 @@ build null:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/null"
+    PACKAGE_NAME: "null"
   extends: .build-package
 
 build productfetcher:
@@ -125,6 +134,7 @@ build productfetcher:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/productfetcher"
+    PACKAGE_NAME: "productfetcher"
   extends: .build-package
 
 build update stage:
@@ -132,6 +142,7 @@ build update stage:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/update_stage"
+    PACKAGE_NAME: "update_stage"
   extends: .build-package
 
 build vela:
@@ -139,6 +150,7 @@ build vela:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/vela"
+    PACKAGE_NAME: "vela"
   extends: .build-package
 
 build wf inspector:
@@ -146,6 +158,7 @@ build wf inspector:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/wf_inspector"
+    PACKAGE_NAME: "wf_inspector"
   extends: .build-package
 
 build ws annihilator:
@@ -153,6 +166,7 @@ build ws annihilator:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/ws_annihilator"
+    PACKAGE_NAME: "ws_annihilator"
   extends: .build-package
 
 build ws metrics:
@@ -160,6 +174,7 @@ build ws metrics:
   stage: build-packages
   variables:
     PACKAGE_PATH: "apps/cli/executables/pexable/ws_metrics"
+    PACKAGE_NAME: "ws_metrics"
   extends: .build-package
 
 
@@ -568,4 +583,3 @@ deploy:
             # override ENV_HOST
             ENV_HOST: ws.nrao.edu
             VERSION: $CI_COMMIT_TAG
-
diff --git a/ci/package-build.template.yml b/ci/package-build.template.yml
index d5396d82e1e1b280b791873ff196d16aa64ca3f6..3a22065991154d43ef57541a541a6123af5810b6 100644
--- a/ci/package-build.template.yml
+++ b/ci/package-build.template.yml
@@ -7,7 +7,6 @@
         - echo building package in $PACKAGE_PATH
         - export CAPO_PATH=$PWD
         - export CAPO_PROFILE=docker
-        - export PACKAGE_NAME=$(basename $PACKAGE_PATH)
         - WD=$PWD
         - cd ${PACKAGE_PATH}