diff --git a/.github/workflows/build-spack.yml b/.github/workflows/build-spack.yml
index 8b4d8b7d..efa592d3 100644
--- a/.github/workflows/build-spack.yml
+++ b/.github/workflows/build-spack.yml
@@ -8,8 +8,8 @@ on:
       - "*"
   schedule:
     - cron: '0 4 * * 1'   # Schedule it every Sunday
-      
-jobs:  
+
+jobs:
   build_spack:
     name: build_spack
     runs-on: ubuntu-latest
@@ -23,8 +23,7 @@ jobs:
         uses: actions/checkout@v2
       - name: Move Package Script
         run: |
-          cp spack/repo/packages/py-pyprecice/package.py /py-pyprecice-repo/packages/py-pyprecice/
-          cp spack/repo/packages/py-pyprecice/*.patch /py-pyprecice-repo/packages/py-pyprecice/
+          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 find && spack dev-build py-pyprecice@develop target=x86_64 && spack load precice py-numpy py-mpi4py py-cython openssh openmpi && mkdir runner && cd runner && python3 -c "import precice; print(precice.__version__)"
+          . /opt/spack/share/spack/setup-env.sh && spack env activate ci && spack arch && spack find && spack dev-build pyprecice.test.py-pyprecice@develop target=x86_64 && spack load precice py-numpy py-mpi4py py-cython openssh openmpi && mkdir runner && cd runner && python3 -c "import precice; print(precice.__version__)"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98036805..54f0b4af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 
 ## latest
 
+* Improve CI w.r.t spack package. https://github.com/precice/python-bindings/pull/117
 * Synchronize spack package with https://github.com/spack/spack/pull/25077 via https://github.com/precice/python-bindings/pull/116.
 
 ## 2.2.1.1
diff --git a/spack/ci-spack-pyprecice-deps-1804.dockerfile b/spack/ci-spack-pyprecice-deps-1804.dockerfile
index fb7c3cfa..016fec64 100644
--- a/spack/ci-spack-pyprecice-deps-1804.dockerfile
+++ b/spack/ci-spack-pyprecice-deps-1804.dockerfile
@@ -1,11 +1,11 @@
 # Build stage with Spack pre-installed and ready to be used
-FROM spack/ubuntu-bionic:latest 
+FROM spack/ubuntu-bionic:latest
 
 # Mount the current sources into the build container
 # and build the default environment
 ADD ./spack/repo /py-pyprecice-repo
 RUN spack --color=always env create --without-view ci && \
-    spack --color=always -e ci add py-pyprecice@develop target=x86_64 && \
     spack --color=always -e ci repo add /py-pyprecice-repo && \
+    spack --color=always -e ci add pyprecice.test.py-pyprecice@develop target=x86_64 && \
     spack --color=always -e ci install --fail-fast --only=dependencies && \
     spack --color=always clean -a
diff --git a/spack/repo/repo.yaml b/spack/repo/repo.yaml
index 61517481..e484875a 100644
--- a/spack/repo/repo.yaml
+++ b/spack/repo/repo.yaml
@@ -1,2 +1,2 @@
 repo:
-  namespace: 'spack'
+  namespace: 'pyprecice.test'