diff --git a/.github/workflows/lint-bicep.yml b/.github/workflows/lint-bicep.yml
index c030b1b6cc1..3965395a6cc 100644
--- a/.github/workflows/lint-bicep.yml
+++ b/.github/workflows/lint-bicep.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Upgrade bicep
         run: |
           which bicep
-          sudo curl -o $(which bicep) -L https://github.com/Azure/bicep/releases/download/v0.35.1/bicep-linux-x64
+          sudo curl -o $(which bicep) -L https://github.com/Azure/bicep/releases/download/v0.36.1/bicep-linux-x64
           sudo chmod +x $(which bicep)
       - name: Lint .bicep files
         run: $ErrorActionPreference='Continue'; eng/scripts/Test-BicepLint.ps1 -Verbose
diff --git a/cli/azd/pkg/tools/bicep/bicep.go b/cli/azd/pkg/tools/bicep/bicep.go
index 45936ed616e..1947ff8d5cd 100644
--- a/cli/azd/pkg/tools/bicep/bicep.go
+++ b/cli/azd/pkg/tools/bicep/bicep.go
@@ -25,7 +25,7 @@ import (
 
 // Version is the minimum version of bicep that we require (and the one we fetch when we fetch bicep on behalf of a
 // user).
-var Version semver.Version = semver.MustParse("0.35.1")
+var Version semver.Version = semver.MustParse("0.36.1")
 
 // NewCli creates a new Bicep CLI. Azd manages its own copy of the bicep CLI, stored in `$AZD_CONFIG_DIR/bin`. If
 // bicep is not present at this location, or if it is present but is older than the minimum supported version, it is
diff --git a/templates/common/infra/bicep/core/host/container-apps.bicep b/templates/common/infra/bicep/core/host/container-apps.bicep
index 64f4f2aed30..980af1360ae 100644
--- a/templates/common/infra/bicep/core/host/container-apps.bicep
+++ b/templates/common/infra/bicep/core/host/container-apps.bicep
@@ -23,9 +23,11 @@ module containerAppsEnvironment 'container-apps-environment.bicep' = {
   }
 }
 
+var containerRegistryRG = empty(containerRegistryResourceGroupName) ? resourceGroup() : resourceGroup(containerRegistryResourceGroupName)
+
 module containerRegistry 'container-registry.bicep' = {
   name: '${name}-container-registry'
-  scope: !empty(containerRegistryResourceGroupName) ? resourceGroup(containerRegistryResourceGroupName) : resourceGroup()
+  scope: containerRegistryRG
   params: {
     name: containerRegistryName
     location: location