diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e2c16b6..77e9c32 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -74,8 +74,11 @@ twistlock-discovery:on-schedule:
   rules:
     - !reference [.mirror-schedule-csr-rules, rules]
   dependencies: []
+  variables:
+    # need to override this variable for github agents because the tag will need the 'v' if it exists
+    NO_V_RELEASE_TAG_REGEX: "^v?[0-9]{1,}\\.[0-9]{1,}\\.[0-9]{1,}$"
   before_script:
-    - !reference [.get-last-tag, script]
+    - !reference [.get-agent-last-tag, script]
     - echo "Using the last tagged version ${LAST_TAG_VERSION}"
     - export IMAGE_NAME=ghcr.io/axway/apigee_discovery_agent:${LAST_TAG_VERSION}
     - docker pull ${IMAGE_NAME}
@@ -85,8 +88,11 @@ twistlock-traceability:on-schedule:
   rules:
     - !reference [.mirror-schedule-csr-rules, rules]
   dependencies: []
+  variables:
+    # need to override this variable for github agents because the tag will need the 'v' if it exists
+    NO_V_RELEASE_TAG_REGEX: "^v?[0-9]{1,}\\.[0-9]{1,}\\.[0-9]{1,}$"
   before_script:
-    - !reference [.get-last-tag, script]
+    - !reference [.get-agent-last-tag, script]
     - echo "Using the last tagged version ${LAST_TAG_VERSION}"
     - export IMAGE_NAME=ghcr.io/axway/apigee_traceability_agent:${LAST_TAG_VERSION}
     - docker pull ${IMAGE_NAME}
@@ -108,7 +114,7 @@ blackduck:on-schedule:
   rules:
     - !reference [.mirror-schedule-csr-rules, rules]
   before_script:
-    - !reference [.get-last-tag, script]
+    - !reference [.get-agent-last-tag, script]
 
 run-csr:
   rules:
diff --git a/release.sh b/release.sh
index 367c255..3213d90 100755
--- a/release.sh
+++ b/release.sh
@@ -43,6 +43,13 @@ get_sdk_version()
 }
 
 post_to_teams() {
+    # don't post if this is a pre-release tag
+    pat='[0-9]+\.[0-9]+\.[0-9]+-'
+    if [[ ${TAG} =~ $pat ]]; then
+      echo "This is an interim release... skipping the post to Teams"
+      return 0
+    fi
+
     rel_date=$(date +'%m/%d/%Y')
     JSON="{
         \"@type\": \"MessageCard\",