diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 8e0795b..be38880 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,8 +1,5 @@
 FROM dolfinx/dolfinx:v0.6.0
 
-LABEL org.opencontainers.image.source https://github.com/equinor/warmth
-ARG DEBIAN_FRONTEND=noninteractive
-
 RUN DEBIAN_FRONTEND=noninteractive \
     && apt-get update \ 
     && apt-get install -y build-essential --no-install-recommends make \
diff --git a/.github/workflows/python-test-3d.yml b/.github/workflows/python-test-3d.yml
index b805d9b..9796d28 100644
--- a/.github/workflows/python-test-3d.yml
+++ b/.github/workflows/python-test-3d.yml
@@ -15,7 +15,7 @@ on:
         type: string
 jobs:
   build:
-
+    environment: test3d
     runs-on: ubuntu-latest
 
     steps:
@@ -27,8 +27,6 @@ jobs:
         image: ghcr.io/equinor/warmth:latest
         name: dolfinx
         options: -v ${{ github.workspace }}:/home/warmth
-        args: |
-          bash -c "cd /home/warmth" && pip install . pytest==7.4.2 pytest-cov==4.1.0 && pytest --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt
 
 
     - name: Comment coverage
diff --git a/.github/workflows/python-test.yml b/.github/workflows/python-test.yml
index 5b6a59c..09d6cbf 100644
--- a/.github/workflows/python-test.yml
+++ b/.github/workflows/python-test.yml
@@ -64,7 +64,7 @@ jobs:
       with:
         filters: |
           mesh3d:
-            - 'warmth/3d/**'
+            - 'warmth/warmth3d/**'
     - uses: equinor/warmth/.github/workflows/python-test-3d.yml@main
       if: ${{ steps.filter3d.outputs.mesh3d }} == 'true'
       with:
diff --git a/Dockerfile b/Dockerfile
index 8deb2da..cb50235 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,32 +1,6 @@
 FROM dolfinx/dolfinx:v0.6.0
 
 LABEL org.opencontainers.image.source https://github.com/equinor/warmth
-ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /home/warmth
 
-RUN DEBIAN_FRONTEND=noninteractive \
-    && apt-get update \ 
-    && apt-get install -y build-essential --no-install-recommends make \
-        ca-certificates \
-        git \
-        libssl-dev \
-        zlib1g-dev \
-        libbz2-dev \
-        libreadline-dev \
-        libsqlite3-dev \
-        wget \
-        curl \
-        llvm \
-        libncurses5-dev \
-        xz-utils \
-        tk-dev \
-        libxml2-dev \
-        libxmlsec1-dev \
-        libffi-dev \
-        liblzma-dev
-
-RUN useradd  -rm -d /home/vscode -s /bin/bash -g root -G sudo -u 1000 vscode -p ""
-USER vscode
-WORKDIR /home/vscode
-ENV HOME=/home/vscode
-ENV PATH="/root/.local/bin:$HOME/.local/bin::$PATH"
-RUN curl -sSL https://install.python-poetry.org | python3 - 
+ENTRYPOINT pip install . pytest==7.4.2 pytest-cov==4.1.0 && pytest --cov-report=term-missing --cov=warmth tests | tee pytest-coverage.txt