diff --git a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1 b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
index fcfbe3c..d29abbc 100644
--- a/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
+++ b/Modules/VMware.VMC.NSXT/VMware.VMC.NSXT.psm1
@@ -525,7 +525,11 @@ Function New-NSXTFirewall {
 
         $scopeLabels = @()
         if(!$InfraScope) {
-            $scopeLabels = @("/infra/labels/$($GatewayType.toLower())-all")
+            if($GatewayType.toLower() -eq "cgw") {
+                $scopeLabels = @("/infra/labels/$($GatewayType.toLower())-all")
+            } else {
+                $scopeLabels = @("/infra/labels/$($GatewayType.toLower())")
+            }
         } else {
             foreach ($infraScopeName in $InfraScope) {
                 $scope = Get-NSXTInfraScope -Name $infraScopeName