diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index bd92760..5684f25 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -22,8 +22,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub
       - uses: docker/build-push-action@v5 # Using v5 for latest features
         with:
-          context: ./src/xcp_ng_dev/
-          file: ./src/xcp_ng_dev/files/Dockerfile-8.x
+          context: ./container
+          file: ./container/Dockerfile-8.x
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: ghcr.io/${{ github.repository }}:8.2
           cache-from: type=gha,scope=${{ github.ref_name }}-82 # Cache layers to speed up builds
@@ -48,8 +48,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub
       - uses: docker/build-push-action@v5 # Using v5 for latest features
         with:
-          context: ./src/xcp_ng_dev/
-          file: ./src/xcp_ng_dev/files/Dockerfile-8.x
+          context: ./container
+          file: ./container/Dockerfile-8.x
           push: ${{ github.ref == 'refs/heads/master' }}
           tags: ghcr.io/${{ github.repository }}:8.3
           cache-from: type=gha,scope=${{ github.ref_name }}-83 # Cache layers to speed up builds
@@ -73,8 +73,8 @@ jobs:
   #         password: ${{ secrets.GITHUB_TOKEN }} # Automatically provided by GitHub
   #     - uses: docker/build-push-action@v5 # Using v5 for latest features
   #       with:
-  #         context: ./src/xcp_ng_dev/
-  #         file: ./src/xcp_ng_dev/files/Dockerfile-9.x
+  #         context: ./container
+  #         file: ./container/Dockerfile-9.x
   #         platforms: |
   #           linux/amd64/v2
   #         push: ${{ github.ref == 'refs/heads/master' }}
diff --git a/src/xcp_ng_dev/files/Dockerfile-8.x b/container/Dockerfile-8.x
similarity index 100%
rename from src/xcp_ng_dev/files/Dockerfile-8.x
rename to container/Dockerfile-8.x
diff --git a/src/xcp_ng_dev/files/Dockerfile-9.x b/container/Dockerfile-9.x
similarity index 100%
rename from src/xcp_ng_dev/files/Dockerfile-9.x
rename to container/Dockerfile-9.x
diff --git a/src/xcp_ng_dev/build.sh b/container/build.sh
similarity index 95%
rename from src/xcp_ng_dev/build.sh
rename to container/build.sh
index 30f64a8..5e9324c 100755
--- a/src/xcp_ng_dev/build.sh
+++ b/container/build.sh
@@ -71,12 +71,12 @@ ALMA_VERSION=
 CENTOS_VERSION=
 case "$1" in
     9.*)
-        DOCKERFILE=files/Dockerfile-9.x
+        DOCKERFILE=Dockerfile-9.x
         ALMA_VERSION=10.0
         : ${PLATFORM:=linux/amd64/v2}
         ;;
     8.*)
-        DOCKERFILE=files/Dockerfile-8.x
+        DOCKERFILE=Dockerfile-8.x
         : ${PLATFORM:=linux/amd64}
         ;;
     *)
diff --git a/src/xcp_ng_dev/files/Alma10-devel.repo b/container/files/Alma10-devel.repo
similarity index 100%
rename from src/xcp_ng_dev/files/Alma10-devel.repo
rename to container/files/Alma10-devel.repo
diff --git a/src/xcp_ng_dev/files/CentOS-Vault.repo.in b/container/files/CentOS-Vault.repo.in
similarity index 100%
rename from src/xcp_ng_dev/files/CentOS-Vault.repo.in
rename to container/files/CentOS-Vault.repo.in
diff --git a/src/xcp_ng_dev/files/entrypoint.sh b/container/files/entrypoint.sh
similarity index 100%
rename from src/xcp_ng_dev/files/entrypoint.sh
rename to container/files/entrypoint.sh
diff --git a/src/xcp_ng_dev/files/init-container.sh b/container/files/init-container.sh
similarity index 100%
rename from src/xcp_ng_dev/files/init-container.sh
rename to container/files/init-container.sh
diff --git a/src/xcp_ng_dev/files/rpmmacros b/container/files/rpmmacros
similarity index 100%
rename from src/xcp_ng_dev/files/rpmmacros
rename to container/files/rpmmacros
diff --git a/src/xcp_ng_dev/files/xcp-ng-8.99.repo b/container/files/xcp-ng-8.99.repo
similarity index 100%
rename from src/xcp_ng_dev/files/xcp-ng-8.99.repo
rename to container/files/xcp-ng-8.99.repo
diff --git a/src/xcp_ng_dev/files/xcp-ng.repo.7.x.in b/container/files/xcp-ng.repo.7.x.in
similarity index 100%
rename from src/xcp_ng_dev/files/xcp-ng.repo.7.x.in
rename to container/files/xcp-ng.repo.7.x.in
diff --git a/src/xcp_ng_dev/files/xcp-ng.repo.8.x.in b/container/files/xcp-ng.repo.8.x.in
similarity index 100%
rename from src/xcp_ng_dev/files/xcp-ng.repo.8.x.in
rename to container/files/xcp-ng.repo.8.x.in
diff --git a/src/xcp_ng_dev/files/yum.conf.xs b/container/files/yum.conf.xs
similarity index 100%
rename from src/xcp_ng_dev/files/yum.conf.xs
rename to container/files/yum.conf.xs
diff --git a/pyproject.toml b/pyproject.toml
index 646665b..f9ae8db 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -12,7 +12,6 @@ dependencies = [
 
 [project.scripts]
 xcp-ng-dev = "xcp_ng_dev.cli:main"
-xcp-ng-dev-env-create = "xcp_ng_dev.cli:build"
 
 [project.urls]
 Homepage = "https://github.com/xcp-ng/xcp-ng-build-env/"
diff --git a/src/xcp_ng_dev/cli.py b/src/xcp_ng_dev/cli.py
index 642d543..5fd4e9c 100755
--- a/src/xcp_ng_dev/cli.py
+++ b/src/xcp_ng_dev/cli.py
@@ -252,10 +252,5 @@ def main():
 
     sys.exit(return_code)
 
-def build():
-    bargs = [os.path.join(os.path.dirname(__file__), 'build.sh')] + sys.argv[1:]
-    return_code = subprocess.call(bargs)
-    sys.exit(return_code)
-
 if __name__ == "__main__":
     main()
diff --git a/test/test.sh b/test/test.sh
index 34327fd..9250a36 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -4,7 +4,7 @@ set -eux
 
 TARGET_XCP_NG_VERSION="8.2"
 
-xcp-ng-dev-env-create "$TARGET_XCP_NG_VERSION"
+./container/build.sh "$TARGET_XCP_NG_VERSION"
 
 REPOS=xcp-emu-manager