diff --git a/src/main/python/ddadevops/infrastructure/__init__.py b/src/main/python/ddadevops/infrastructure/__init__.py
index baba117..8ba4491 100644
--- a/src/main/python/ddadevops/infrastructure/__init__.py
+++ b/src/main/python/ddadevops/infrastructure/__init__.py
@@ -1,2 +1,2 @@
-from .infrastructure import FileApi, ImageApi, ResourceApi, ExecutionApi, ProjectRepository
+from .infrastructure import FileApi, ImageApi, ResourceApi, ExecutionApi, ProjectRepository, EnvironmentApi
 from .repository import DevopsRepository, BuildFileRepository
\ No newline at end of file
diff --git a/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py b/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
index 7c50c26..b3120ff 100644
--- a/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
+++ b/src/main/python/ddadevops/infrastructure/release_mixin/__init__.py
@@ -1,2 +1,2 @@
-from .infrastructure_api import FileHandler, EnvironmentApi, GitApi, JsonFileHandler, GradleFileHandler, PythonFileHandler, ClojureFileHandler
+from .infrastructure_api import FileHandler, GitApi, JsonFileHandler, GradleFileHandler, PythonFileHandler, ClojureFileHandler
 from .repo import VersionRepository, ReleaseContextRepository, ReleaseTypeRepository
diff --git a/src/main/python/ddadevops/infrastructure/release_mixin/repo.py b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py
index 2557042..011c58c 100644
--- a/src/main/python/ddadevops/infrastructure/release_mixin/repo.py
+++ b/src/main/python/ddadevops/infrastructure/release_mixin/repo.py
@@ -7,8 +7,8 @@ from src.main.python.ddadevops.domain import (
 from src.main.python.ddadevops.infrastructure.release_mixin.infrastructure_api import (
     FileHandler,
     GitApi,
-    EnvironmentApi,
 )
+from src.main.python.ddadevops.infrastructure import EnvironmentApi
 
 
 class VersionRepository:
diff --git a/src/main/python/ddadevops/release_mixin.py b/src/main/python/ddadevops/release_mixin.py
index c2d93c6..8b5a94d 100644
--- a/src/main/python/ddadevops/release_mixin.py
+++ b/src/main/python/ddadevops/release_mixin.py
@@ -1,6 +1,7 @@
 from pybuilder.core import Project
 from src.main.python.ddadevops.devops_build import DevopsBuild
-from src.main.python.ddadevops.infrastructure.release_mixin import ReleaseContextRepository, ReleaseTypeRepository, VersionRepository, GitApi, EnvironmentApi
+from src.main.python.ddadevops.infrastructure.release_mixin import ReleaseContextRepository, ReleaseTypeRepository, VersionRepository, GitApi
+from src.main.python.ddadevops.infrastructure import EnvironmentApi
 from src.main.python.ddadevops.application import PrepareReleaseService, TagAndPushReleaseService
 from src.main.python.ddadevops.domain import Release, EnvironmentKeys, MixinType