diff --git a/cmd/workflow/activate/activate.go b/cmd/workflow/activate/activate.go
index a2a86719..d250fd61 100644
--- a/cmd/workflow/activate/activate.go
+++ b/cmd/workflow/activate/activate.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/smartcontractkit/cre-cli/cmd/client"
+	workflowcommon "github.com/smartcontractkit/cre-cli/cmd/workflow/common"
 	"github.com/smartcontractkit/cre-cli/internal/environments"
 	"github.com/smartcontractkit/cre-cli/internal/runtime"
 	"github.com/smartcontractkit/cre-cli/internal/settings"
@@ -122,7 +123,13 @@ func (h *handler) Execute() error {
 		return fmt.Errorf("missing required flags for --non-interactive mode")
 	}
 
-	h.displayWorkflowDetails()
+	workflowcommon.DisplayWorkflowDetails(
+		h.settings,
+		h.runtimeContext,
+		"Activating",
+		h.inputs.WorkflowName,
+		h.inputs.WorkflowOwner,
+	)
 
 	strategy, err := newRegistryActivateStrategy(h.runtimeContext.ResolvedRegistry, h)
 	if err != nil {
@@ -147,11 +154,3 @@ func (h *handler) resolveWorkflowOwner(registryType settings.RegistryType) (stri
 
 	return owner, nil
 }
-
-func (h *handler) displayWorkflowDetails() {
-	ui.Line()
-	ui.Title(fmt.Sprintf("Activating Workflow: %s", h.inputs.WorkflowName))
-	ui.Dim(fmt.Sprintf("Target:        %s", h.settings.User.TargetName))
-	ui.Dim(fmt.Sprintf("Owner Address: %s", h.inputs.WorkflowOwner))
-	ui.Line()
-}
diff --git a/cmd/workflow/common/display_workflow_details.go b/cmd/workflow/common/display_workflow_details.go
new file mode 100644
index 00000000..bbbcafc7
--- /dev/null
+++ b/cmd/workflow/common/display_workflow_details.go
@@ -0,0 +1,29 @@
+package common
+
+import (
+	"fmt"
+
+	"github.com/smartcontractkit/cre-cli/internal/runtime"
+	"github.com/smartcontractkit/cre-cli/internal/settings"
+	"github.com/smartcontractkit/cre-cli/internal/ui"
+)
+
+func DisplayWorkflowDetails(
+	cfg *settings.Settings,
+	runtimeContext *runtime.Context,
+	action,
+	workflowName,
+	ownerAddress string,
+) {
+	displayOwnerAddress := ownerAddress
+	if runtimeContext.ResolvedRegistry.Type() == settings.RegistryTypeOffChain {
+		displayOwnerAddress += " (derived)"
+	}
+
+	ui.Line()
+	ui.Title(fmt.Sprintf("%s Workflow: %s", action, workflowName))
+	ui.Dim(fmt.Sprintf("Registry:      %s", runtimeContext.ResolvedRegistry.ID()))
+	ui.Dim(fmt.Sprintf("Target:        %s", cfg.User.TargetName))
+	ui.Dim(fmt.Sprintf("Owner Address: %s", displayOwnerAddress))
+	ui.Line()
+}
diff --git a/cmd/workflow/delete/delete.go b/cmd/workflow/delete/delete.go
index 6e43fb1d..928a1546 100644
--- a/cmd/workflow/delete/delete.go
+++ b/cmd/workflow/delete/delete.go
@@ -9,6 +9,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/smartcontractkit/cre-cli/cmd/client"
+	workflowcommon "github.com/smartcontractkit/cre-cli/cmd/workflow/common"
 	"github.com/smartcontractkit/cre-cli/internal/credentials"
 	"github.com/smartcontractkit/cre-cli/internal/environments"
 	"github.com/smartcontractkit/cre-cli/internal/runtime"
@@ -133,7 +134,13 @@ func (h *handler) Execute() error {
 		return err
 	}
 
-	h.displayWorkflowDetails()
+	workflowcommon.DisplayWorkflowDetails(
+		h.settings,
+		h.runtimeContext,
+		"Deleting",
+		h.inputs.WorkflowName,
+		h.inputs.WorkflowOwner,
+	)
 
 	workflows, err := adapter.FetchWorkflows()
 	if err != nil {
@@ -212,11 +219,3 @@ func (h *handler) askForWorkflowDeletionConfirmation(expectedWorkflowName string
 
 	return result == expectedWorkflowName, nil
 }
-
-func (h *handler) displayWorkflowDetails() {
-	ui.Line()
-	ui.Title(fmt.Sprintf("Deleting Workflow: %s", h.inputs.WorkflowName))
-	ui.Dim(fmt.Sprintf("Target:        %s", h.settings.User.TargetName))
-	ui.Dim(fmt.Sprintf("Owner Address: %s", h.inputs.WorkflowOwner))
-	ui.Line()
-}
diff --git a/cmd/workflow/deploy/deploy.go b/cmd/workflow/deploy/deploy.go
index 3436894b..ba6c37c6 100644
--- a/cmd/workflow/deploy/deploy.go
+++ b/cmd/workflow/deploy/deploy.go
@@ -12,6 +12,7 @@ import (
 
 	"github.com/smartcontractkit/cre-cli/cmd/client"
 	cmdcommon "github.com/smartcontractkit/cre-cli/cmd/common"
+	workflowcommon "github.com/smartcontractkit/cre-cli/cmd/workflow/common"
 	"github.com/smartcontractkit/cre-cli/internal/accessrequest"
 	"github.com/smartcontractkit/cre-cli/internal/credentials"
 	"github.com/smartcontractkit/cre-cli/internal/environments"
@@ -262,7 +263,13 @@ func (h *handler) Execute(ctx context.Context) error {
 // Artifact upload is deferred to the deploy service so it runs after any
 // existing-workflow update confirmation.
 func (h *handler) prepareArtifacts() error {
-	h.displayWorkflowDetails()
+	workflowcommon.DisplayWorkflowDetails(
+		h.settings,
+		h.runtimeContext,
+		"Deploying",
+		h.inputs.WorkflowName,
+		h.inputs.WorkflowOwner,
+	)
 
 	if cmdcommon.IsURL(h.inputs.WasmPath) {
 		h.inputs.BinaryURL = h.inputs.WasmPath
@@ -321,14 +328,6 @@ func (h *handler) resolveWorkflowOwner(registryType settings.RegistryType) (stri
 	return owner, nil
 }
 
-func (h *handler) displayWorkflowDetails() {
-	ui.Line()
-	ui.Title(fmt.Sprintf("Deploying Workflow: %s", h.inputs.WorkflowName))
-	ui.Dim(fmt.Sprintf("Target:        %s", h.settings.User.TargetName))
-	ui.Dim(fmt.Sprintf("Owner Address: %s", h.inputs.WorkflowOwner))
-	ui.Line()
-}
-
 func confirmWorkflowOverwrite(workflowName string, skipConfirmation, nonInteractive bool) error {
 	ui.Warning(fmt.Sprintf("Workflow %s already exists", workflowName))
 	ui.Dim("This will update the existing workflow.")
diff --git a/cmd/workflow/pause/pause.go b/cmd/workflow/pause/pause.go
index b2b3dfca..19eaadf2 100644
--- a/cmd/workflow/pause/pause.go
+++ b/cmd/workflow/pause/pause.go
@@ -8,6 +8,7 @@ import (
 	"github.com/spf13/viper"
 
 	"github.com/smartcontractkit/cre-cli/cmd/client"
+	workflowcommon "github.com/smartcontractkit/cre-cli/cmd/workflow/common"
 	"github.com/smartcontractkit/cre-cli/internal/environments"
 	"github.com/smartcontractkit/cre-cli/internal/runtime"
 	"github.com/smartcontractkit/cre-cli/internal/settings"
@@ -119,7 +120,13 @@ func (h *handler) Execute() error {
 		return fmt.Errorf("missing required flags for --non-interactive mode")
 	}
 
-	h.displayWorkflowDetails()
+	workflowcommon.DisplayWorkflowDetails(
+		h.settings,
+		h.runtimeContext,
+		"Pausing",
+		h.inputs.WorkflowName,
+		h.inputs.WorkflowOwner,
+	)
 
 	strategy, err := newRegistryPauseStrategy(h.runtimeContext.ResolvedRegistry, h)
 	if err != nil {
@@ -144,11 +151,3 @@ func (h *handler) resolveWorkflowOwner(registryType settings.RegistryType) (stri
 
 	return owner, nil
 }
-
-func (h *handler) displayWorkflowDetails() {
-	ui.Line()
-	ui.Title(fmt.Sprintf("Pausing Workflow: %s", h.inputs.WorkflowName))
-	ui.Dim(fmt.Sprintf("Target:        %s", h.settings.User.TargetName))
-	ui.Dim(fmt.Sprintf("Owner Address: %s", h.inputs.WorkflowOwner))
-	ui.Line()
-}
diff --git a/internal/settings/registry_resolution.go b/internal/settings/registry_resolution.go
index 01c6b230..797c4f7d 100644
--- a/internal/settings/registry_resolution.go
+++ b/internal/settings/registry_resolution.go
@@ -127,7 +127,7 @@ func ParseRegistryType(raw string) RegistryType {
 
 func defaultFromEnvironmentSet(envSet *environments.EnvironmentSet) *OnChainRegistry {
 	return NewOnChainRegistry(
-		"",
+		fmt.Sprintf("onchain:%s", envSet.WorkflowRegistryChainName),
 		envSet.WorkflowRegistryAddress,
 		envSet.WorkflowRegistryChainName,
 		envSet.DonFamily,