diff --git a/.gitignore b/.gitignore
index 0bd4a13728..78e148eb06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,3 @@ apps/**/generated
 .cspellcache
 
 *.tsbuildinfo
-
-# bruno
-cloud.bru
diff --git a/apps/avatax/bruno/Checkout/1_Create_storefront_user.bru b/apps/avatax/bruno/Checkout/1_Create_storefront_user.bru
deleted file mode 100644
index 806d334bdf..0000000000
--- a/apps/avatax/bruno/Checkout/1_Create_storefront_user.bru
+++ /dev/null
@@ -1,82 +0,0 @@
-meta {
-  name: 1. Create storefront user
-  type: graphql
-  seq: 1
-}
-
-post {
-  url: {{API_URL}}
-  body: graphql
-  auth: none
-}
-
-body:graphql {
-  mutation CreateStoreFrontUser(
-    $channelSlug: String
-    $email: String!
-    $password: String!
-    $firstName: String
-  ) {
-    accountRegister(
-      input: {
-        firstName: $firstName
-        email: $email
-        password: $password
-        channel: $channelSlug
-        metadata: [{ key: "avataxCustomerCode", value: "code" }]
-      }
-    ) {
-      user {
-        id
-        metadata {
-          key
-          value
-        }
-      }
-      errors {
-        code
-        field
-        message
-      }
-    }
-  }
-  
-}
-
-body:graphql:vars {
-  {
-      "channelSlug": "{{channel_USD}}",
-      "email": "{{storefrontUserEmail}}",
-      "password": "{{storefrontUserPassword}}",
-      "firstName": "{{storefrontUserFirstName}}"
-  }
-}
-
-script:pre-request {
-  const { faker } = require('@faker-js/faker');
-  
-  const configuredEmail = bru.getProcessEnv("STOREFRONT_USER_EMAIL");
-  
-  if (configuredEmail) {
-    bru.setVar("storefrontUserEmail", configuredEmail);
-  } else {
-    bru.setVar("storefrontUserEmail", faker.internet.email());
-  }
-  
-  const configuredPassword = bru.getProcessEnv("STOREFRONT_USER_PASSWORD");
-  
-  if (configuredPassword) {
-    bru.setVar("storefrontUserPassword", configuredPassword);
-  } else {
-    bru.setVar("storefrontUserPassword", faker.internet.password());
-  }
-
-  const configuredFirstName = bru.getProcessEnv("STOREFRONT_USER_NAME");
-
-  if (configuredFirstName) {
-    bru.setVar("storefrontUserFirstName", configuredFirstName);
-  } else {
-    bru.setVar("storefrontUserFirstName", faker.name.firstName());
-  }
-
-}
diff --git a/apps/avatax/bruno/checkout/01-create-storefront-user.bru b/apps/avatax/bruno/checkout/01-create-storefront-user.bru
new file mode 100644
index 0000000000..5f1af686ef
--- /dev/null
+++ b/apps/avatax/bruno/checkout/01-create-storefront-user.bru
@@ -0,0 +1,53 @@
+meta {
+  name: 01. Create storefront user
+  type: graphql
+  seq: 1
+}
+
+post {
+  url: {{saleorApiUrl}}
+  body: graphql
+  auth: none
+}
+
+body:graphql {
+  mutation CreateStoreFrontUser(
+    $channelSlug: String
+    $email: String!
+    $password: String!
+    $firstName: String
+  ) {
+    accountRegister(
+      input: {
+        firstName: $firstName
+        email: $email
+        password: $password
+        channel: $channelSlug
+        metadata: [{ key: "avataxCustomerCode", value: "code" }]
+      }
+    ) {
+      user {
+        id
+        metadata {
+          key
+          value
+        }
+      }
+      errors {
+        code
+        field
+        message
+      }
+    }
+  }
+  
+}
+
+body:graphql:vars {
+  {
+      "channelSlug": "{{channelSlug}}",
+      "email": "{{storefrontUserEmail}}",
+      "password": "{{storefrontUserPassword}}",
+      "firstName": "{{storefrontUserFirstName}}"
+  }
+}
diff --git a/apps/avatax/bruno/Checkout/2_Create_storefront_token.bru b/apps/avatax/bruno/checkout/02-create-storefront-token.bru
similarity index 52%
rename from apps/avatax/bruno/Checkout/2_Create_storefront_token.bru
rename to apps/avatax/bruno/checkout/02-create-storefront-token.bru
index 2075f7ae2b..c79f3c104d 100644
--- a/apps/avatax/bruno/Checkout/2_Create_storefront_token.bru
+++ b/apps/avatax/bruno/checkout/02-create-storefront-token.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 2. Create storefront user token
+  name: 02. Create storefront user token
   type: graphql
   seq: 2
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: none
 }
@@ -37,20 +37,3 @@ body:graphql:vars {
 vars:post-response {
   storefrontUserToken: res.body.data.tokenCreate.token
 }
-
-script:pre-request {
-  const { faker } = require('@faker-js/faker');
-  
-  const configuredEmail = bru.getProcessEnv("STOREFRONT_USER_EMAIL");
-  
-  if (configuredEmail) {
-    bru.setVar("storefrontUserEmail", configuredEmail);
-  }
-  
-  const configuredPassword = bru.getProcessEnv("STOREFRONT_USER_PASSWORD");
-  
-  if (configuredPassword) {
-    bru.setVar("storefrontUserPassword", configuredPassword);
-  }
-  
-}
diff --git a/apps/avatax/bruno/Checkout/3_Fetch_product.bru b/apps/avatax/bruno/checkout/03-Fetch-product.bru
similarity index 86%
rename from apps/avatax/bruno/Checkout/3_Fetch_product.bru
rename to apps/avatax/bruno/checkout/03-Fetch-product.bru
index 8b86023680..23e0726fa8 100644
--- a/apps/avatax/bruno/Checkout/3_Fetch_product.bru
+++ b/apps/avatax/bruno/checkout/03-Fetch-product.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 3. Fetch product
+  name: 03. Fetch product
   type: graphql
   seq: 3
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
@@ -31,7 +31,7 @@ body:graphql {
 
 body:graphql:vars {
   {
-    "channelSlug": "{{channel_USD}}"
+    "channelSlug": "{{channelSlug}}"
   }
 }
 
diff --git a/apps/avatax/bruno/Checkout/4_Create_checkout_US.bru b/apps/avatax/bruno/checkout/04-create-checkout.bru
similarity index 95%
rename from apps/avatax/bruno/Checkout/4_Create_checkout_US.bru
rename to apps/avatax/bruno/checkout/04-create-checkout.bru
index 45697d770d..10ccc35fa9 100644
--- a/apps/avatax/bruno/Checkout/4_Create_checkout_US.bru
+++ b/apps/avatax/bruno/checkout/04-create-checkout.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 4. Create checkout - US
+  name: 04. Create checkout
   type: graphql
   seq: 4
 }
 
 post {
-  url: {{API_URL}}
+  url: {{channelSlug}}
   body: graphql
   auth: bearer
 }
@@ -93,7 +93,7 @@ body:graphql {
 body:graphql:vars {
   {
       "variantId": "{{productVariantId}}",
-      "channelSlug": "{{channel_USD}}",
+      "channelSlug": "{{channelSlug}}",
       "email": "{{storefrontUserEmail}}"
   }
 }
diff --git a/apps/avatax/bruno/Checkout/5._Update_checkout_metadata.bru b/apps/avatax/bruno/checkout/05-update-checkout-metadata.bru
similarity index 91%
rename from apps/avatax/bruno/Checkout/5._Update_checkout_metadata.bru
rename to apps/avatax/bruno/checkout/05-update-checkout-metadata.bru
index 85d9002436..fb65edf36d 100644
--- a/apps/avatax/bruno/Checkout/5._Update_checkout_metadata.bru
+++ b/apps/avatax/bruno/checkout/05-update-checkout-metadata.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 5. Update checkout metadata
+  name: 05. Update checkout metadata
   type: graphql
   seq: 5
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Checkout/6_Update_delivery_method.bru b/apps/avatax/bruno/checkout/06-update-delivery-method.bru
similarity index 95%
rename from apps/avatax/bruno/Checkout/6_Update_delivery_method.bru
rename to apps/avatax/bruno/checkout/06-update-delivery-method.bru
index 7c0a5f4a0b..a3945de2ee 100644
--- a/apps/avatax/bruno/Checkout/6_Update_delivery_method.bru
+++ b/apps/avatax/bruno/checkout/06-update-delivery-method.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 6. Update delivery method
+  name: 06. Update delivery method
   type: graphql
   seq: 6
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Checkout/7_Add_promo_code_checkout.bru b/apps/avatax/bruno/checkout/07-add-promo-code.bru
similarity index 93%
rename from apps/avatax/bruno/Checkout/7_Add_promo_code_checkout.bru
rename to apps/avatax/bruno/checkout/07-add-promo-code.bru
index c29d50e09f..22f141a68e 100644
--- a/apps/avatax/bruno/Checkout/7_Add_promo_code_checkout.bru
+++ b/apps/avatax/bruno/checkout/07-add-promo-code.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 7. Add promo code to checkout
+  name: 07. Add promo code to checkout
   type: graphql
   seq: 7
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: none
 }
diff --git a/apps/avatax/bruno/Checkout/8_Complete_checkout.bru b/apps/avatax/bruno/checkout/08-complete-checkout.bru
similarity index 91%
rename from apps/avatax/bruno/Checkout/8_Complete_checkout.bru
rename to apps/avatax/bruno/checkout/08-complete-checkout.bru
index 263d02159b..b1f20ed230 100644
--- a/apps/avatax/bruno/Checkout/8_Complete_checkout.bru
+++ b/apps/avatax/bruno/checkout/08-complete-checkout.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 8. Complete checkout
+  name: 08. Complete checkout
   type: graphql
   seq: 8
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/01_Create_staff_token.bru b/apps/avatax/bruno/draft-orders/01-create-staff-token.bru
similarity index 90%
rename from apps/avatax/bruno/Draft Orders/01_Create_staff_token.bru
rename to apps/avatax/bruno/draft-orders/01-create-staff-token.bru
index a9e431348b..f2de7a85d0 100644
--- a/apps/avatax/bruno/Draft Orders/01_Create_staff_token.bru	
+++ b/apps/avatax/bruno/draft-orders/01-create-staff-token.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 01 Create staff token
+  name: 01. Create staff token
   type: graphql
   seq: 1
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: none
 }
diff --git a/apps/avatax/bruno/Draft Orders/02_Get_channel_id.bru b/apps/avatax/bruno/draft-orders/02-get-channel-id.bru
similarity index 80%
rename from apps/avatax/bruno/Draft Orders/02_Get_channel_id.bru
rename to apps/avatax/bruno/draft-orders/02-get-channel-id.bru
index f576f05639..835b822770 100644
--- a/apps/avatax/bruno/Draft Orders/02_Get_channel_id.bru	
+++ b/apps/avatax/bruno/draft-orders/02-get-channel-id.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 02 Get channel Id
+  name: 02. Get channel Id
   type: graphql
   seq: 2
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
@@ -27,7 +27,7 @@ body:graphql {
 
 body:graphql:vars {
   {
-    "slug": "{{channel_USD}}"
+    "slug": "{{channelSlug}}"
   }
 }
 
diff --git a/apps/avatax/bruno/Draft Orders/03_Create_draft_order.bru b/apps/avatax/bruno/draft-orders/03-create-draft-order.bru
similarity index 92%
rename from apps/avatax/bruno/Draft Orders/03_Create_draft_order.bru
rename to apps/avatax/bruno/draft-orders/03-create-draft-order.bru
index 43ab8e91c4..5b6602ef6e 100644
--- a/apps/avatax/bruno/Draft Orders/03_Create_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/03-create-draft-order.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 03 Create draft order
+  name: 03. Create draft order
   type: graphql
   seq: 3
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/04_Fetch_products.bru b/apps/avatax/bruno/draft-orders/04-fetch-products.bru
similarity index 93%
rename from apps/avatax/bruno/Draft Orders/04_Fetch_products.bru
rename to apps/avatax/bruno/draft-orders/04-fetch-products.bru
index cc4bbf9029..5d10cf73d0 100644
--- a/apps/avatax/bruno/Draft Orders/04_Fetch_products.bru	
+++ b/apps/avatax/bruno/draft-orders/04-fetch-products.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 04 Fetch products
+  name: 04. Fetch products
   type: graphql
   seq: 4
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: none
 }
diff --git a/apps/avatax/bruno/Draft Orders/05_Add_lines_to_draft_order.bru b/apps/avatax/bruno/draft-orders/05-add-lines.bru
similarity index 96%
rename from apps/avatax/bruno/Draft Orders/05_Add_lines_to_draft_order.bru
rename to apps/avatax/bruno/draft-orders/05-add-lines.bru
index 3dd3a1115a..36fe48388e 100644
--- a/apps/avatax/bruno/Draft Orders/05_Add_lines_to_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/05-add-lines.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 05 Add lines to draft order
+  name: 05. Add lines to draft order
   type: graphql
   seq: 5
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/06_Update_addresses_on_draft_order.bru b/apps/avatax/bruno/draft-orders/06-update-addresses.bru
similarity index 97%
rename from apps/avatax/bruno/Draft Orders/06_Update_addresses_on_draft_order.bru
rename to apps/avatax/bruno/draft-orders/06-update-addresses.bru
index c4429a68cf..04ea6a5598 100644
--- a/apps/avatax/bruno/Draft Orders/06_Update_addresses_on_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/06-update-addresses.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 06 Update Addresses on draft order
+  name: 06. Update Addresses on draft order
   type: graphql
   seq: 6
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/07_Update_shipping_method_on_draft_order.bru b/apps/avatax/bruno/draft-orders/07-update-shipping-method.bru
similarity index 95%
rename from apps/avatax/bruno/Draft Orders/07_Update_shipping_method_on_draft_order.bru
rename to apps/avatax/bruno/draft-orders/07-update-shipping-method.bru
index 7b7ced611a..ecb409ca30 100644
--- a/apps/avatax/bruno/Draft Orders/07_Update_shipping_method_on_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/07-update-shipping-method.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 07 Update shipping method on draft order
+  name: 07. Update shipping method on draft order
   type: graphql
   seq: 7
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/08_Update_lines_on_draft_order.bru b/apps/avatax/bruno/draft-orders/08-update-lines.bru
similarity index 96%
rename from apps/avatax/bruno/Draft Orders/08_Update_lines_on_draft_order.bru
rename to apps/avatax/bruno/draft-orders/08-update-lines.bru
index 3a5410c7cc..2665f10f67 100644
--- a/apps/avatax/bruno/Draft Orders/08_Update_lines_on_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/08-update-lines.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 08 Update lines on draft order
+  name: 08. Update lines on draft order
   type: graphql
   seq: 8
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/09_Remove_lines_on_draft_order.bru b/apps/avatax/bruno/draft-orders/09-remove-lines.bru
similarity index 96%
rename from apps/avatax/bruno/Draft Orders/09_Remove_lines_on_draft_order.bru
rename to apps/avatax/bruno/draft-orders/09-remove-lines.bru
index fbcf5259d2..c582741ae5 100644
--- a/apps/avatax/bruno/Draft Orders/09_Remove_lines_on_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/09-remove-lines.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 09 Remove lines on draft order
+  name: 09. Remove lines on draft order
   type: graphql
   seq: 9
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/10_Add_voucher_to_draft_order.bru b/apps/avatax/bruno/draft-orders/10-add-voucher.bru
similarity index 96%
rename from apps/avatax/bruno/Draft Orders/10_Add_voucher_to_draft_order.bru
rename to apps/avatax/bruno/draft-orders/10-add-voucher.bru
index 3c397ea2d6..d03e03c059 100644
--- a/apps/avatax/bruno/Draft Orders/10_Add_voucher_to_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/10-add-voucher.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 10 Add voucher to draft order
+  name: 10. Add voucher to draft order
   type: graphql
   seq: 10
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/Draft Orders/11_Complete_draft_order.bru b/apps/avatax/bruno/draft-orders/11-complete-draft-order.bru
similarity index 96%
rename from apps/avatax/bruno/Draft Orders/11_Complete_draft_order.bru
rename to apps/avatax/bruno/draft-orders/11-complete-draft-order.bru
index c043887f03..d0d5e00dfa 100644
--- a/apps/avatax/bruno/Draft Orders/11_Complete_draft_order.bru	
+++ b/apps/avatax/bruno/draft-orders/11-complete-draft-order.bru
@@ -1,11 +1,11 @@
 meta {
-  name: 11 Complete draft order
+  name: 11. Complete draft order
   type: graphql
   seq: 11
 }
 
 post {
-  url: {{API_URL}}
+  url: {{saleorApiUrl}}
   body: graphql
   auth: bearer
 }
diff --git a/apps/avatax/bruno/environments/cloud.bru b/apps/avatax/bruno/environments/cloud.bru
new file mode 100644
index 0000000000..9c067d2bb9
--- /dev/null
+++ b/apps/avatax/bruno/environments/cloud.bru
@@ -0,0 +1,10 @@
+vars {
+  channelSlug: {{process.env.CHANNEL_SLUG}}
+  promoCode: {{process.env.PROMO_CODE}}
+  saleorApiUrl: {{process.env.SALEOR_API_URL}}
+  staffUserEmail: {{process.env.STAFF_USER_EMAIL}}
+  staffUserPassword: {{process.env.STAFF_USER_PASSWORD}}
+  storefrontUserEmail: {{process.env.STOREFRONT_USER_EMAIL}}
+  storefrontUserName: {{process.env.STOREFRONT_USER_NAME}}
+  storefrontUserPassword: {{process.env.STOREFRONT_USER_PASSWORD}}
+}
diff --git a/apps/avatax/bruno/environments/localhost.bru b/apps/avatax/bruno/environments/localhost.bru
index e3c4e51959..09d2f2dcc4 100644
--- a/apps/avatax/bruno/environments/localhost.bru
+++ b/apps/avatax/bruno/environments/localhost.bru
@@ -1,6 +1,10 @@
 vars {
-  API_URL: http://localhost:8000/graphql/
-  deliveryMethodId: U2hpcHBpbmdNZXRob2Q6Mg==
-  channel_USD: default-channel
+  channelSlug: default-channel
   promoCode: ""
+  saleorApiUrl: http://localhost:8000/graphql/
+  staffUserEmail: {{process.env.STAFF_USER_EMAIL}}
+  staffUserPassword: {{process.env.STAFF_USER_PASSWORD}}
+  storefrontUserEmail: {{process.env.STOREFRONT_USER_EMAIL}}
+  storefrontUserName: {{process.env.STOREFRONT_USER_NAME}}
+  storefrontUserPassword: {{process.env.STOREFRONT_USER_PASSWORD}}
 }
diff --git a/apps/avatax/bruno/environments/staging.bru b/apps/avatax/bruno/environments/staging.bru
deleted file mode 100644
index 5b7f69ea64..0000000000
--- a/apps/avatax/bruno/environments/staging.bru
+++ /dev/null
@@ -1,7 +0,0 @@
-vars {
-  channel_USD: {{process.env.CHANNEL_SLUG}}
-  promoCode: {{process.env.PROMO_CODE}}
-  staffUserEmail: {{process.env.STAFF_USER_EMAIL}}
-  staffUserPassword: {{process.env.STAFF_USER_PASSWORD}}
-  API_URL: {{process.env.SALEOR_API_URL}}
-}