diff --git a/.github/workflows/docker_build.yml b/.github/workflows/docker_build.yml
index 07b581b..a30c04d 100644
--- a/.github/workflows/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -65,17 +65,20 @@ jobs:
 
       - name: Build image
         run: |
+          cd dockerfiles/
           docker compose build ${{ env.SERVICE }}
 
       - name: Tag image
         if: ${{ github.event_name == 'push' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
 
       - name: Tag 'latest' image
         if: ${{ github.ref_type == 'tag' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:latest
         # DATE=`date +%Y%m%d`
@@ -119,17 +122,20 @@ jobs:
 
       - name: Build image
         run: |
+          cd dockerfiles/
           docker compose build ${{ env.SERVICE }}
 
       - name: Tag image
         if: ${{ github.event_name == 'push' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
 
       - name: Tag 'latest' image
         if: ${{ github.ref_type == 'tag' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:latest
           docker tag $NEW_IMAGE ${{ env.REPO }}:${ISIS_VERSION}
@@ -158,6 +164,7 @@ jobs:
 
       - name: Save image
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker save --output /tmp/image.tar $NEW_IMAGE
 
@@ -200,17 +207,20 @@ jobs:
 
       - name: Build image
         run: |
+          cd dockerfiles/
           docker compose build ${{ env.SERVICE }}
 
       - name: Tag image
         if: ${{ github.event_name == 'push' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:$GITHUB_REF_NAME
 
       - name: Tag 'latest' image
         if: ${{ github.ref_type == 'tag' }}
         run: |
+          cd dockerfiles/
           NEW_IMAGE=`docker compose config --images ${{ env.SERVICE }}`
           docker tag $NEW_IMAGE ${{ env.REPO }}:latest
           docker tag $NEW_IMAGE ${{ env.REPO }}:${ISIS_VERSION}-${ASP_VERSION}
diff --git a/dockerfiles/.env b/dockerfiles/.env
deleted file mode 120000
index f214448..0000000
--- a/dockerfiles/.env
+++ /dev/null
@@ -1 +0,0 @@
-build.env
\ No newline at end of file
diff --git a/dockerfiles/.env b/dockerfiles/.env
new file mode 100644
index 0000000..3f86b8b
--- /dev/null
+++ b/dockerfiles/.env
@@ -0,0 +1,22 @@
+# BUILD attributes
+# ----------------
+
+ISIS_VERSION="7.1.0"
+ASP_VERSION="3.2.0"
+# ISIS_VERSION="8.0.0"
+# ASP_VERSION="3.3.0"
+
+GISPY_BASE_IMAGE="jupyter/scipy-notebook:2023-10-20"
+GISPY_IMAGE="jupyter-gispy:latest"
+
+ISIS_BASE_IMAGE="jupyter/minimal-notebook:2023-10-20"
+ISIS_IMAGE="jupyter-isis:latest"
+
+ASP_BASE_IMAGE="$ISIS_IMAGE"
+ASP_IMAGE="jupyter-isis-asp:latest"
+
+
+# ISIS-data directories environment variables in new image
+# ------------------
+ISISDATA="/mnt/isis/data"
+ISISTESTDATA="/mnt/isis/testdata"
diff --git a/dockerfiles/build.env b/dockerfiles/build.env
deleted file mode 100644
index 3f86b8b..0000000
--- a/dockerfiles/build.env
+++ /dev/null
@@ -1,22 +0,0 @@
-# BUILD attributes
-# ----------------
-
-ISIS_VERSION="7.1.0"
-ASP_VERSION="3.2.0"
-# ISIS_VERSION="8.0.0"
-# ASP_VERSION="3.3.0"
-
-GISPY_BASE_IMAGE="jupyter/scipy-notebook:2023-10-20"
-GISPY_IMAGE="jupyter-gispy:latest"
-
-ISIS_BASE_IMAGE="jupyter/minimal-notebook:2023-10-20"
-ISIS_IMAGE="jupyter-isis:latest"
-
-ASP_BASE_IMAGE="$ISIS_IMAGE"
-ASP_IMAGE="jupyter-isis-asp:latest"
-
-
-# ISIS-data directories environment variables in new image
-# ------------------
-ISISDATA="/mnt/isis/data"
-ISISTESTDATA="/mnt/isis/testdata"