diff --git a/apps/invoices/src/pages/api/manifest.ts b/apps/invoices/src/pages/api/manifest.ts
index bd536d7..ba5c62b 100644
--- a/apps/invoices/src/pages/api/manifest.ts
+++ b/apps/invoices/src/pages/api/manifest.ts
@@ -7,19 +7,27 @@ import { REQUIRED_SALEOR_VERSION } from "../../saleor-app";
 
 export default createManifestHandler({
   async manifestFactory(context) {
+    const iframeBaseUrl = process.env.APP_IFRAME_BASE_URL ?? context.appBaseUrl;
+    const apiBaseURL = process.env.APP_API_BASE_URL ?? context.appBaseUrl;
+
     const manifest: AppManifest = {
       name: "Invoices",
-      tokenTargetUrl: `${context.appBaseUrl}/api/register`,
-      appUrl: context.appBaseUrl,
+      tokenTargetUrl: `${apiBaseURL}/api/register`,
+      appUrl: iframeBaseUrl,
       permissions: ["MANAGE_ORDERS"],
       id: "saleor.app.invoices",
       version: packageJson.version,
-      webhooks: [invoiceRequestedWebhook.getWebhookManifest(context.appBaseUrl)],
+      webhooks: [invoiceRequestedWebhook.getWebhookManifest(apiBaseURL)],
       extensions: [],
       supportUrl: "https://github.com/saleor/apps/discussions",
       homepageUrl: "https://github.com/saleor/apps",
       dataPrivacyUrl: "https://saleor.io/legal/privacy/",
       author: "Saleor Commerce",
+      brand: {
+        logo: {
+          default: `${apiBaseURL}/logo.png`,
+        },
+      },
       /**
        * Requires 3.10 due to invoices event payload - in previous versions, order reference was missing
        */
diff --git a/apps/invoices/turbo.json b/apps/invoices/turbo.json
index ea524a2..85e2b40 100644
--- a/apps/invoices/turbo.json
+++ b/apps/invoices/turbo.json
@@ -20,7 +20,9 @@
         "SENTRY_ORG",
         "SENTRY_AUTH_TOKEN",
         "NEXT_PUBLIC_SENTRY_DSN",
-        "SENTRY_ENVIRONMENT"
+        "SENTRY_ENVIRONMENT",
+        "APP_IFRAME_BASE_URL",
+        "APP_API_BASE_URL"
       ]
     }
   }
diff --git a/apps/products-feed/src/pages/api/manifest.ts b/apps/products-feed/src/pages/api/manifest.ts
index 0ca8625..5216923 100644
--- a/apps/products-feed/src/pages/api/manifest.ts
+++ b/apps/products-feed/src/pages/api/manifest.ts
@@ -10,19 +10,22 @@ import { webhookProductVariantUpdated } from "./webhooks/product_variant_updated
 
 export default createManifestHandler({
   async manifestFactory(context) {
+    const iframeBaseUrl = process.env.APP_IFRAME_BASE_URL ?? context.appBaseUrl;
+    const apiBaseURL = process.env.APP_API_BASE_URL ?? context.appBaseUrl;
+
     const manifest: AppManifest = {
       name: "Product Feed",
-      tokenTargetUrl: `${context.appBaseUrl}/api/register`,
-      appUrl: context.appBaseUrl,
+      tokenTargetUrl: `${apiBaseURL}/api/register`,
+      appUrl: iframeBaseUrl,
       permissions: ["MANAGE_PRODUCTS"],
       id: "saleor.app.product-feed",
       version: packageJson.version,
       webhooks: [
-        webhookProductCreated.getWebhookManifest(context.appBaseUrl),
-        webhookProductDeleted.getWebhookManifest(context.appBaseUrl),
-        webhookProductVariantCreated.getWebhookManifest(context.appBaseUrl),
-        webhookProductVariantDeleted.getWebhookManifest(context.appBaseUrl),
-        webhookProductVariantUpdated.getWebhookManifest(context.appBaseUrl),
+        webhookProductCreated.getWebhookManifest(apiBaseURL),
+        webhookProductDeleted.getWebhookManifest(apiBaseURL),
+        webhookProductVariantCreated.getWebhookManifest(apiBaseURL),
+        webhookProductVariantDeleted.getWebhookManifest(apiBaseURL),
+        webhookProductVariantUpdated.getWebhookManifest(apiBaseURL),
       ],
       extensions: [],
       author: "Saleor Commerce",
@@ -31,7 +34,7 @@ export default createManifestHandler({
       dataPrivacyUrl: "https://saleor.io/legal/privacy/",
       brand: {
         logo: {
-          default: `${context.appBaseUrl}/logo.png`,
+          default: `${apiBaseURL}/logo.png`,
         },
       },
     };
diff --git a/apps/products-feed/turbo.json b/apps/products-feed/turbo.json
index 05a7384..1479d14 100644
--- a/apps/products-feed/turbo.json
+++ b/apps/products-feed/turbo.json
@@ -20,7 +20,9 @@
         "FEED_CACHE_MAX_AGE",
         "VERCEL_URL",
         "PORT",
-        "SENTRY_ENVIRONMENT"
+        "SENTRY_ENVIRONMENT",
+        "APP_IFRAME_BASE_URL",
+        "APP_API_BASE_URL"
       ]
     }
   }