diff --git a/build.yaml b/build.yaml
index 631d69c..594cb11 100644
--- a/build.yaml
+++ b/build.yaml
@@ -9,9 +9,7 @@ codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io
 cosign:
-  base_issuer: https://token.actions.githubusercontent.com
   base_identity: https://github.com/home-assistant/docker-base/.*
-  issuer: https://token.actions.githubusercontent.com
   identity: https://github.com/home-assistant/builder/.*
 args:
   CAS_VERSION: "1.0.1"
diff --git a/builder.sh b/builder.sh
index ad55cdd..969ccb8 100755
--- a/builder.sh
+++ b/builder.sh
@@ -249,9 +249,9 @@ function run_build() {
     # Read build.json / cosign
     if bashio::fs.file_exists "/tmp/build_config/build.json"; then
         cosign_base_identity="$(jq --raw-output '.cosign.base_identity // empty' "/tmp/build_config/build.json")"
-        cosign_base_issuer="$(jq --raw-output '.cosign.base_issuer // empty' "/tmp/build_config/build.json")"
+        cosign_base_issuer="$(jq --raw-output '.cosign.base_issuer // "https://token.actions.githubusercontent.com"' "/tmp/build_config/build.json")"
         cosign_identity="$(jq --raw-output '.cosign.identity // empty' "/tmp/build_config/build.json")"
-        cosign_issuer="$(jq --raw-output '.cosign.issuer // empty' "/tmp/build_config/build.json")"
+        cosign_issuer="$(jq --raw-output '.cosign.issuer // "https://token.actions.githubusercontent.com"' "/tmp/build_config/build.json")"
 
         # remove later
         codenotary_sign="$(jq --raw-output '.codenotary.signer // empty' "/tmp/build_config/build.json")"