diff --git a/.github/workflows/build-env.yml b/.github/workflows/build-env.yml
index 8de2030a..99853729 100644
--- a/.github/workflows/build-env.yml
+++ b/.github/workflows/build-env.yml
@@ -2,6 +2,12 @@ name: Update build environment
 
 on:
   workflow_dispatch:      # Trigger by hand from the UI
+    inputs:
+      tag:
+        description: 'tag for docker image'
+        required: true
+        default: 'latest'
+        type: string
   schedule:
     - cron: '0 0 * * 0'   # Schedule it every Sunday
 
@@ -24,5 +30,5 @@ jobs:
         with:
           push: true
           context: .
-          file: spack/ci-spack-pyprecice-deps-2204.dockerfile
-          tags: precice/ci-spack-pyprecice-deps-2204
+          file: spack/ci-spack-pyprecice-deps-2404.dockerfile
+          tags: precice/ci-spack-pyprecice-deps-2404:${{ inputs.tag }}
diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index 5e5449f2..37c4cce5 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -1,35 +1,35 @@
-# name: Build Spack
-# on:
-#   push:
-#     branches:
-#       - "*"
-#   pull_request:
-#     branches:
-#       - "*"
-#   schedule:
-#     - cron: '0 4 * * 1'   # Schedule it every Sunday
-#
-# jobs:
-#   build_spack:
-#     name: build_spack
-#     runs-on: ubuntu-latest
-#     timeout-minutes: 15
-#     container: precice/ci-spack-pyprecice-deps-2404
-#     defaults:
-#       run:
-#         shell: "bash --login -eo pipefail {0}"
-#     steps:
-#       - name: Checkout Repository
-#         uses: actions/checkout@v2
-#       - name: Move Package Script
-#         run: |
-#           cp -r spack/repo/packages/py-pyprecice/ /py-pyprecice-repo/packages/
-#       - name: Try to build py-pyprecice with spack and test it
-#         run: |
-#           . /opt/spack/share/spack/setup-env.sh
-#           spack env activate ci && spack arch
-#           spack remove py-pyprecice
-#           spack add pyprecice.test.py-pyprecice@develop && spack develop pyprecice.test.py-pyprecice@develop
-#           spack install && spack find
-#           spack load py-pyprecice
-#           BINDINGS_VERSION=$(python3 -c "import precice; print(precice.__version__)") && echo "Installed version of bindings is ${BINDINGS_VERSION}"
\ No newline at end of file
+name: Build Spack
+on:
+  push:
+    branches:
+      - "*"
+  pull_request:
+    branches:
+      - "*"
+  schedule:
+    - cron: '0 4 * * 1'   # Schedule it every Sunday
+
+jobs:
+  build_spack:
+    name: build_spack
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+    container: precice/ci-spack-pyprecice-deps-2404
+    defaults:
+      run:
+        shell: "bash --login -eo pipefail {0}"
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v2
+      - name: Move Package Script
+        run: |
+          cp -r spack/repo/packages/py-pyprecice/ /py-pyprecice-repo/packages/
+      - name: Try to build py-pyprecice with spack and test it
+        run: |
+          . /opt/spack/share/spack/setup-env.sh
+          spack env activate ci && spack arch
+          spack remove py-pyprecice
+          spack add pyprecice.test.py-pyprecice@develop && spack develop pyprecice.test.py-pyprecice@develop
+          spack install && spack find
+          spack load py-pyprecice
+          BINDINGS_VERSION=$(python3 -c "import precice; print(precice.__version__)") && echo "Installed version of bindings is ${BINDINGS_VERSION}"