diff --git a/.gitea/workflows/publish.yaml b/.gitea/workflows/publish.yaml
index 8433974..af52fc1 100644
--- a/.gitea/workflows/publish.yaml
+++ b/.gitea/workflows/publish.yaml
@@ -24,8 +24,4 @@ jobs:
       - name: "Install jq"
         run: apt -y update && apt -y install jq
       - name: "Publish Record"
-        run: |
-          CERC_REPO_TAG=${{ github.sha }} \
-          CERC_LACONIC_BOND_ID=$CICD_LACONIC_BOND_ID \
-          CERC_LACONIC_USER_KEY=$CICD_LACONIC_USER_KEY \
-          scripts/publish-app-record.sh
+        run: scripts/publish-app-record.sh
diff --git a/scripts/publish-app-record.sh b/scripts/publish-app-record.sh
index d575198..8c3e730 100755
--- a/scripts/publish-app-record.sh
+++ b/scripts/publish-app-record.sh
@@ -6,7 +6,7 @@ RECORD_FILE=tmp.rf.$$
 CONFIG_FILE=`mktemp`
 
 CERC_APP_TYPE=${CERC_APP_TYPE:-"webapp"}
-CERC_REPO_TAG=${CERC_REPO_TAG:-"main"}
+CERC_REPO_TAG=${CERC_REPO_TAG:-${GITHUB_SHA:-main}}
 
 rcd_name=$(jq -r '.name' package.json | sed 's/null//')
 rcd_desc=$(jq -r '.description' package.json | sed 's/null//')
@@ -46,6 +46,6 @@ EOF
 
 cat $RECORD_FILE
 env
-laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_LACONIC_USER_KEY}" --bond-id $CERC_LACONIC_BOND_ID
+laconic -c $CONFIG_FILE cns record publish --filename $RECORD_FILE --user-key "${CERC_LACONIC_USER_KEY:-$CICD_LACONIC_USER_KEY}" --bond-id ${CERC_LACONIC_BOND_ID:-$CICD_LACONIC_BOND_ID}
 
 rm -f $RECORD_FILE $CONFIG_FILE