diff --git a/docker/build-all.sh b/docker/build-all.sh
index e134326..77ef152 100755
--- a/docker/build-all.sh
+++ b/docker/build-all.sh
@@ -69,14 +69,14 @@ bash build.sh
 
 # Main container
 #----------------------
-cd ../main-env
+cd ../main
 
 bash build.sh
 
 
 # Full container
 #----------------------
-cd ../full-env
+cd ../full
 
 # Generate the lock file from the conda environment.yml
 # bash generate-lock.sh
diff --git a/docker/full-env/build.sh b/docker/full/build.sh
similarity index 100%
rename from docker/full-env/build.sh
rename to docker/full/build.sh
diff --git a/docker/full-env/full-py-env.Dockerfile b/docker/full/full-py-env.Dockerfile
similarity index 100%
rename from docker/full-env/full-py-env.Dockerfile
rename to docker/full/full-py-env.Dockerfile
diff --git a/docker/full-env/full-stage2.Dockerfile b/docker/full/full-stage2.Dockerfile
similarity index 100%
rename from docker/full-env/full-stage2.Dockerfile
rename to docker/full/full-stage2.Dockerfile
diff --git a/docker/full-env/generate-lock.sh b/docker/full/generate-lock.sh
similarity index 100%
rename from docker/full-env/generate-lock.sh
rename to docker/full/generate-lock.sh
diff --git a/docker/full-env/home/.condarc b/docker/full/home/.condarc
similarity index 100%
rename from docker/full-env/home/.condarc
rename to docker/full/home/.condarc
diff --git a/docker/full-env/home/.profile b/docker/full/home/.profile
similarity index 100%
rename from docker/full-env/home/.profile
rename to docker/full/home/.profile
diff --git a/docker/full-env/testing/facsimilab-testing.ipynb b/docker/full/testing/facsimilab-testing.ipynb
similarity index 100%
rename from docker/full-env/testing/facsimilab-testing.ipynb
rename to docker/full/testing/facsimilab-testing.ipynb
diff --git a/docker/full-env/testing/package_versions.py b/docker/full/testing/package_versions.py
similarity index 100%
rename from docker/full-env/testing/package_versions.py
rename to docker/full/testing/package_versions.py
diff --git a/docker/full-env/testing/versions.py b/docker/full/testing/versions.py
similarity index 100%
rename from docker/full-env/testing/versions.py
rename to docker/full/testing/versions.py
diff --git a/docker/full-env/tmp/environment.yml b/docker/full/tmp/environment.yml
similarity index 100%
rename from docker/full-env/tmp/environment.yml
rename to docker/full/tmp/environment.yml
diff --git a/docker/full-env/tmp/facsimilab-conda-lock.yml b/docker/full/tmp/facsimilab-conda-lock.yml
similarity index 100%
rename from docker/full-env/tmp/facsimilab-conda-lock.yml
rename to docker/full/tmp/facsimilab-conda-lock.yml
diff --git a/docker/main-env/build.sh b/docker/main/build.sh
similarity index 100%
rename from docker/main-env/build.sh
rename to docker/main/build.sh
diff --git a/docker/main-env/environment.yml b/docker/main/environment.yml
similarity index 100%
rename from docker/main-env/environment.yml
rename to docker/main/environment.yml
diff --git a/docker/main-env/home/.condarc b/docker/main/home/.condarc
similarity index 100%
rename from docker/main-env/home/.condarc
rename to docker/main/home/.condarc
diff --git a/docker/main-env/home/.profile b/docker/main/home/.profile
similarity index 100%
rename from docker/main-env/home/.profile
rename to docker/main/home/.profile
diff --git a/docker/main-env/main-py-env.Dockerfile b/docker/main/main-py-env.Dockerfile
similarity index 100%
rename from docker/main-env/main-py-env.Dockerfile
rename to docker/main/main-py-env.Dockerfile
diff --git a/docker/main-env/main-stage2.Dockerfile b/docker/main/main-stage2.Dockerfile
similarity index 100%
rename from docker/main-env/main-stage2.Dockerfile
rename to docker/main/main-stage2.Dockerfile