diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 20aee11f..babd89dc 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -133,7 +133,7 @@ jobs:
         ;;
         esac
 
-        if [[ "${{ github.event.inputs.PRODUCT_NAME }}" == *_*/* ]] && [[ "${{ github.event.inputs.PRODUCT_NAME }}" != gsi_* ]] && [[ "${{ github.event.inputs.PRODUCT_NAME }}" != sdk_* ]]; then
+        if [[ ${{ github.event.inputs.PRODUCT_NAME }} == *_* ]] && [[ ${{ github.event.inputs.PRODUCT_NAME }} != gsi_* ]] && [[ ${{ github.event.inputs.PRODUCT_NAME }} != sdk_* ]]; then
           LUNCH="lunch ${{ github.event.inputs.PRODUCT_NAME }}-${{ github.event.inputs.BUILD_TYPE }}"
         elif [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" ]] && [[ "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then
             LUNCH="riseup ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}"
diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
index 5000fde1..822cdcc3 100644
--- a/.github/workflows/selfhosted.yml
+++ b/.github/workflows/selfhosted.yml
@@ -171,7 +171,7 @@ jobs:
         ;;
         esac
 
-        if [[ "${{ github.event.inputs.PRODUCT_NAME }}" == *_*/* ]] && [[ "${{ github.event.inputs.PRODUCT_NAME }}" != gsi_* ]] && [[ "${{ github.event.inputs.PRODUCT_NAME }}" != sdk_* ]]; then
+        if [[ ${{ github.event.inputs.PRODUCT_NAME }} == *_* ]] && [[ ${{ github.event.inputs.PRODUCT_NAME }} != gsi_* ]] && [[ ${{ github.event.inputs.PRODUCT_NAME }} != sdk_* ]]; then
           LUNCH="lunch ${{ github.event.inputs.PRODUCT_NAME }}-${{ github.event.inputs.BUILD_TYPE }}"
         elif [[ "${{ github.event.inputs.BASE_PROJECT }}" == "RisingOS 14" ]] && [[ "${{ github.event.inputs.BUILD_DIFFERENT_ROM }}" == "echo 'Build Starting!'" ]]; then
             LUNCH="riseup ${{ github.event.inputs.PRODUCT_NAME }} ${{ github.event.inputs.BUILD_TYPE }}"