diff --git a/lib/Genesis/Env.pm b/lib/Genesis/Env.pm
index d084cae0..4ecb6ac9 100644
--- a/lib/Genesis/Env.pm
+++ b/lib/Genesis/Env.pm
@@ -3320,6 +3320,16 @@ sub _post_deploy {
 		$opts{'canaries'} ? "canaries=$opts{'canaries'}" : undef,
 		$opts{'max-in-flight'} ? "max-in-flight=$opts{'max-in-flight'}" : undef,
 	));
+
+	# Run post-deploy hook 
+	$self->run_hook(
+		'post-deploy',
+		rc => $state->{results}[1],
+		data => $state->{predeploy_data},
+		interactive => !$noprompt,
+		flags => $opt_flags,
+	) if $self->has_hook('post-deploy');
+
 	my $exodus_overrides = {};
 	if ($self->is_bosh_director && $self->cpi_enabled) {
 		$exodus_overrides->{default_cpi_config} = $self->cpi_name;
@@ -3356,15 +3366,6 @@ sub _post_deploy {
 		}
 	}
 
-	# Run post-deploy hook
-	$self->run_hook(
-		'post-deploy',
-		rc => $state->{results}[1],
-		data => $state->{predeploy_data},
-		interactive => !$noprompt,
-		flags => $opt_flags,
-	) if $self->has_hook('post-deploy');
-
 	# Clean up deployment state
 	delete $self->{deployment_state};