diff --git a/.DS_Store b/.DS_Store
deleted file mode 100644
index db2565e..0000000
Binary files a/.DS_Store and /dev/null differ
diff --git a/api/fx/ingestor/.DS_Store b/api/fx/ingestor/.DS_Store
deleted file mode 100644
index ffdd749..0000000
Binary files a/api/fx/ingestor/.DS_Store and /dev/null differ
diff --git a/api/notification/.DS_Store b/api/notification/.DS_Store
deleted file mode 100644
index c82e4d9..0000000
Binary files a/api/notification/.DS_Store and /dev/null differ
diff --git a/api/pkg/.DS_Store b/api/pkg/.DS_Store
deleted file mode 100644
index 1aa90dd..0000000
Binary files a/api/pkg/.DS_Store and /dev/null differ
diff --git a/ci/prod/compose/bff.yml b/ci/prod/compose/bff.yml
index a50ad11..605f3da 100644
--- a/ci/prod/compose/bff.yml
+++ b/ci/prod/compose/bff.yml
@@ -43,7 +43,7 @@ services:
     ports:
       - "0.0.0.0:${BFF_HTTP_PORT}:8081"
     healthcheck:
-      test: ["CMD-SHELL","wget -qO- http://localhost:8081/health | grep -q '\"status\":\"ok\"'"]
+      test: ["CMD-SHELL","wget -qO- http://localhost:8081/api/v1/health | grep -q '\"status\":\"ok\"'"]
       interval: 30s
       timeout: 10s
       retries: 3
diff --git a/ci/scripts/common/bump_version.sh b/ci/scripts/common/bump_version.sh
index d8c6c7b..b17d240 100755
--- a/ci/scripts/common/bump_version.sh
+++ b/ci/scripts/common/bump_version.sh
@@ -67,20 +67,23 @@ if [ -z "${BRANCH}" ] || [ "${BRANCH}" = "HEAD" ]; then
   BRANCH="$(git rev-parse --abbrev-ref HEAD)"
 fi
 
-NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-}}"
-NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-}}}}"
-NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-}}"
+NETRC_MACHINE="${CI_NETRC_MACHINE:-${WOODPECKER_NETRC_MACHINE:-${DRONE_NETRC_MACHINE:-}}}"
+NETRC_USERNAME="${CI_NETRC_USERNAME:-${WOODPECKER_NETRC_USERNAME:-${DRONE_NETRC_USERNAME:-${CI_NETRC_LOGIN:-${WOODPECKER_NETRC_LOGIN:-${DRONE_NETRC_LOGIN:-}}}}}}"
+NETRC_PASSWORD="${CI_NETRC_PASSWORD:-${WOODPECKER_NETRC_PASSWORD:-${DRONE_NETRC_PASSWORD:-}}}"
 if [ -n "${NETRC_MACHINE}" ] && [ -n "${NETRC_USERNAME}" ] && [ -n "${NETRC_PASSWORD}" ]; then
   NETRC_FILE="${HOME:-/root}/.netrc"
-  if [ ! -f "${NETRC_FILE}" ]; then
-    {
-      printf 'machine %s\n' "${NETRC_MACHINE}"
-      printf 'login %s\n' "${NETRC_USERNAME}"
-      printf 'password %s\n' "${NETRC_PASSWORD}"
-    } > "${NETRC_FILE}"
-    chmod 600 "${NETRC_FILE}"
-    echo "[bump-version] wrote credentials for ${NETRC_MACHINE}"
-  fi
+  {
+    printf 'machine %s\n' "${NETRC_MACHINE}"
+    printf 'login %s\n' "${NETRC_USERNAME}"
+    printf 'password %s\n' "${NETRC_PASSWORD}"
+  } > "${NETRC_FILE}"
+  chmod 600 "${NETRC_FILE}"
+  echo "[bump-version] configured credentials for ${NETRC_MACHINE}"
+fi
+
+REMOTE_URL="${CI_REPO_REMOTE:-${WOODPECKER_GIT_REMOTE:-${DRONE_REMOTE_URL:-}}}"
+if [ -n "${REMOTE_URL}" ]; then
+  git remote set-url origin "${REMOTE_URL}"
 fi
 
 git push origin "HEAD:${BRANCH}"