diff --git a/src/Step/Deploy.php b/src/Step/Deploy.php
index 38decd6..0793e90 100644
--- a/src/Step/Deploy.php
+++ b/src/Step/Deploy.php
@@ -36,7 +36,7 @@ public function runImplementation(array $args)
             );
         }
         if($registerBuildIdAs !== false) {
-            self::setVariable($registerBuildIdAs, $buildId);
+            $this->dynamicEnvironment->setVariable($registerBuildIdAs, $buildId);
         }
     }
 
diff --git a/src/Step/StepParent.php b/src/Step/StepParent.php
index e28b250..a89734c 100644
--- a/src/Step/StepParent.php
+++ b/src/Step/StepParent.php
@@ -2,7 +2,6 @@
 
 namespace Migrator\Step;
 
-use _PHPStan_7dd5f1b1b\Nette\Neon\Exception;
 use Migrator\LagoonUtilityBelt;
 use Migrator\LagoonUtilityBeltInterface;
 use Migrator\LoggerTrait;
diff --git a/src/Step/Waitfordeploy.php b/src/Step/Waitfordeploy.php
index b6daadc..720da2b 100644
--- a/src/Step/Waitfordeploy.php
+++ b/src/Step/Waitfordeploy.php
@@ -14,7 +14,7 @@ public function runImplementation(array $args)
           "passIfTextExistsInLogs",
           $args
         ) ? $args["passIfTextExistsInLogs"] : null;
-        $buildId = !empty($args['buildId']) ? self::getVariable($args['buildId']) : null;
+        $buildId = !empty($args['buildId']) ? $this->dynamicEnvironment->getVariable($args['buildId']) : null;
         if (empty($buildId)) {
             throw new \Exception(
               "Cannot run step waitfordeploy without setting a 'buildId'"