diff --git a/Client.UnitTests/DeploymentTest.cs b/Client.UnitTests/DeploymentTest.cs
index 07f0ee88..06df67d7 100644
--- a/Client.UnitTests/DeploymentTest.cs
+++ b/Client.UnitTests/DeploymentTest.cs
@@ -358,7 +358,7 @@ public async Task ShouldSetTenantIdAsExpected()
             };
 
             // when
-            await ZeebeClient.NewDeployCommand().AddTenantId("1234").AddResourceFile(_demoProcessPath).Send();
+            await ZeebeClient.NewDeployCommand().AddResourceFile(_demoProcessPath).AddTenantId("1234").Send();
 
             // then
             var actualRequest = TestService.Requests[typeof(DeployResourceRequest)][0];
diff --git a/Client/Api/Commands/IDeployResourceCommandStep1.cs b/Client/Api/Commands/IDeployResourceCommandStep1.cs
index ab92171b..4520ebc6 100644
--- a/Client/Api/Commands/IDeployResourceCommandStep1.cs
+++ b/Client/Api/Commands/IDeployResourceCommandStep1.cs
@@ -18,7 +18,7 @@
 
 namespace Zeebe.Client.Api.Commands
 {
-    public interface IDeployResourceCommandStep1 : ITenantIdCommandStep<IDeployResourceCommandBuilderStep2>
+    public interface IDeployResourceCommandStep1
     {
         /// <summary>
         /// Add the given resource to the deployment.
@@ -73,5 +73,13 @@ IDeployResourceCommandBuilderStep2 AddResourceStream(
     public interface IDeployResourceCommandBuilderStep2 : IDeployResourceCommandStep1, IFinalCommandWithRetryStep<IDeployResourceResponse>
     {
         // the place for new optional parameters
+
+        /// <summary>
+        /// Set the tenantId for the resource.
+        /// </summary>
+        /// <param name="tenantId">the tenantId to associate to this resource</param>
+        /// <returns>The builder for this command.  Call <see cref="IFinalCommandStep{T}.Send"/> to complete the command and send it
+        ///     to the broker.</returns>
+        IDeployResourceCommandBuilderStep2 AddTenantId(string tenantId);
     }
 }
diff --git a/Client/Api/Commands/ITenantIdCommandStep.cs b/Client/Api/Commands/ITenantIdCommandStep.cs
deleted file mode 100644
index b4802150..00000000
--- a/Client/Api/Commands/ITenantIdCommandStep.cs
+++ /dev/null
@@ -1,13 +0,0 @@
-namespace Zeebe.Client.Api.Commands
-{
-    public interface ITenantIdCommandStep<out T>
-    {
-        /// <summary>
-        /// Set the tenantId for the resource.
-        /// </summary>
-        /// <param name="tenantId">the tenantId to associate to this resource</param>
-        /// <returns>The builder for this command.  Call <see cref="IFinalCommandStep{T}.Send"/> to complete the command and send it
-        ///     to the broker.</returns>
-        T AddTenantId(string tenantId);
-    }
-}
\ No newline at end of file