diff --git a/.cp2k/Makefile b/.cp2k/Makefile
index bd42b3bfab8..20d4f164e8b 100644
--- a/.cp2k/Makefile
+++ b/.cp2k/Makefile
@@ -135,7 +135,7 @@ ifneq (,$(findstring nvcc,$(ACC)))
 override ACCFLAGS += -D__CUDA
 CXXFLAGS += -D__CUDA
 #if "-arch" has not yet been set in ACCFLAGS
-ifeq (,$(findstring "-arch", $(ACCFLAGS)))
+ifeq (,$(findstring -arch,$(ACCFLAGS)))
 override ACCFLAGS += -arch sm_$(ARCH_NUMBER)
 endif
 # If compiling with hipcc
@@ -143,7 +143,7 @@ else ifneq (,$(findstring hipcc,$(ACC)))
 override ACCFLAGS += -D__HIP
 CXXFLAGS += -D__HIP
 #if "--amdgpu-target" has not yet been set in ACCFLAGS
-ifeq (,$(findstring "--amdgpu-target", $(ACCFLAGS)))
+ifeq (,$(findstring --amdgpu-target,$(ACCFLAGS)))
 override ACCFLAGS += --amdgpu-target=$(ARCH_NUMBER)
 endif
 endif
diff --git a/.travis.yml b/.travis.yml
index 8ae76568884..b9948b05d27 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -96,7 +96,7 @@ jobs:  # the following jobs inherit only the first OS
         secure: ID+AX1LOPs+BRGpZiYgP0H9gvOBF/a/o1tNUNDY7Mbo6uShpwVcmYxpqW/2zbWrHXeG4TNZEATED2Yw1nSSp0wj7z/t6ScDuttvYwuN8AExauW7y4WrU5o3qGCGuc9ClDmj3lnQsjqjkmFkqZasmnh2MKHldcDM5cluNs1o/48a/nJ55TEsplKvsPn6gzi+XIs0zY/yIFEZxWEeXs7SlR3Jr+0nDMBHdllnEV/AxdQGQ7y2w6sXN26B7PZNM97kQ8qBGUPnnj41vHtAvT1rGu/N7TcRu+P0n9JmPtC+ZpzBNU8RfI0YJgFOjhORP9gwUNrwNSLZBqJECo2+s6QhjZ7x+UVF9CBQePUnRPJxMjkFVKqfykd7NtREaFJiwwfcWXSq7naVj1n4aNN19jO1myeSP/4WAGMBmEHXSlaDj1jqyaijwPC9YxVeMovTwlDdg0Iv/ZsjE4+MFcgyUU8f0h5x94gbsxgmKPUMaQeuMhdw41wAQm0KcDANwWNyiiGiyw5h0QJcjvg1/HDsrfID0vgqXXMXCfbLEMwpJLWj8F5Htc/D2gGfvepLy9+chqGF/53ntpTPEkF9V1f8ke6QZv7cJhi7U7IOmxWE6OFObPB1auT6g+Got10zkzNDWulk7g6thIFZlarpYqVKUWMfhb3i0ndJLk24L6iJhRuxtp90=
       cleanup: false
       keep_history: true
-      local_dir: build/doc/
+      local_dir: doc/
       on:
         repo: cp2k/dbcsr
         tags: true  # default is "restricted by branch"
@@ -160,8 +160,8 @@ after_success:
   - cd "${TRAVIS_BUILD_DIR}"
   # macOS needs `--gcov-tool /usr/local/bin/gcov-?`, but even then I couldn't make the Coverage run work
   - |
-    if [ "$TRAVIS_OS_NAME" = "linux" && ! -z "$TRAVIS_TAG" ] ; then
-      cd build
-      cmake --build . -- cov-info
-      bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
+    if [ "$TRAVIS_OS_NAME" = "linux" ] && [ -z "$TRAVIS_JOB_NAME" ]; then
+       cd build
+       cmake --build . -- cov-info
+       bash <(curl -s https://codecov.io/bash) -f coverage.info || echo "Codecov did not collect coverage reports"
     fi
diff --git a/VERSION b/VERSION
index 6c782255cda..7f02e971a59 100644
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 MAJOR = 2
 MINOR = 1
-PATCH = 0-rc7
+PATCH = 0-rc8
 # A specific DATE (YYYY-MM-DD) fixes an official release, otherwise
 # it is considered Development version.
 DATE  =