diff --git a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
index 8e06b55d06..a57cdd5383 100644
--- a/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
+++ b/bundles/af-core/src/main/java/com/adobe/cq/forms/core/components/internal/models/v2/form/FormContainerImpl.java
@@ -312,17 +312,12 @@ public String getRoleAttribute() {
 
     @Override
     public String getAction() {
-        List<String> supportedSubmitActions = ComponentUtils.getSupportedSubmitActions(clientBuilderFactory);
         String resourceType = resource.getValueMap().get("sling:resourceType", String.class);
-        if (supportedSubmitActions.contains(resource.getValueMap().get(ReservedProperties.PN_SUBMIT_ACTION_NAME))) {
-            if (resourceType != null && resourceType.contains("/franklin")) {
-                return "";
-            } else {
-                return "https://forms.adobe.com" + ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" +
-                    ComponentUtils.getEncodedPath(resource.getPath() + ".model.json");
-            }
+        if (resourceType != null && resourceType.contains("/franklin")) {
+            return "";
+        } else {
+            return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId());
         }
-        return getContextPath() + resourceResolver.map(ADOBE_GLOBAL_API_ROOT + FORMS_RUNTIME_API_GLOBAL_ROOT + "/submit/" + getId());
     }
 
     @Override
@@ -509,6 +504,7 @@ private Map<String, Object> getSubmitProperties() {
                     ((Map<String, Object>) submitProps.get(SS_SPREADSHEET)).put(entry.getKey(), entry.getValue());
                 }
             }
+            submitProps.put("aemDomainPublish", System.getenv("AEM_DOMAIN_PUBLISH"));
         }
         return submitProps;
     }