diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7da41c750d8a2eb06266edbc080d9ee460e225f8..b6838852408fe2a4eacaa57784d067dce511ed21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -133,7 +133,8 @@ sphinx docs:
     - chmod +x ./CI/create_documentation.sh
     - ./CI/create_documentation.sh
   after_script:
-    - ./CI/update_badge.sh > /dev/null
+    # - ./CI/update_badge.sh > /dev/null
+    - ./CI/update_badge.sh
   when: always
   artifacts:
     name: pages
diff --git a/CI/update_badge.sh b/CI/update_badge.sh
index 6238b16c4552b5d1230a7772fa020e1c9a505f44..f677273b25a7c2e69154e7948aff3b55b137d770 100644
--- a/CI/update_badge.sh
+++ b/CI/update_badge.sh
@@ -11,9 +11,6 @@ printf "%s\n" ${EXIT_STATUS}
 
 # fetch badge_status
 BADGE_STATUS="${CI_COMMIT_REF_NAME}:${CI_JOB_NAME}"
-# replace - with --
-BADGE_STATUS=$( echo -e "${BADGE_STATUS//\-/--}")
-
 
 # Set values for shields.io fields based on STATUS
 if [[ ${EXIT_STATUS} = "running" ]]; then
@@ -47,9 +44,9 @@ fi
 while getopts b:c:s: option
 do
   case ${option} in
-    b) BADGE_STATUS=$( echo -e "${OPTARG//\-/--}");;
-    c) BADGE_COLOR=$( echo -e "${OPTARG//\-/--}");;
-    s) BADGE_SUBJECT=$( echo -e "${OPTARG//\-/--}");;
+    b) BADGE_STATUS=$( echo -e "${OPTARG// /%20}");;
+    c) BADGE_COLOR=$( echo -e "${OPTARG// /%20}");;
+    s) BADGE_SUBJECT=$( echo -e "${OPTARG// /%20}");;
   esac
 done
 
@@ -64,18 +61,15 @@ fi
 RECENT_BADGE_FILENAME="badge_recent-${CI_JOB_NAME}.svg"
 
 # Get the badge from shields.io
-SHIELDS_IO_NAME=${BADGE_STATUS}-${BADGE_SUBJECT}-${BADGE_COLOR}.svg
-printf  "%s\n" "INFO: Fetching badge ${SHIELDS_IO_NAME} from shields.io to ${BADGE_FILENAME}."
-printf  "%s\n" "${SHIELDS_IO_NAME//\_/__}"
-printf  "%s\n" "${SHIELDS_IO_NAME//\#/%23}"
-
-SHIELDS_IO_NAME="$( echo -e "${SHIELDS_IO_NAME//\_/__}" )"
-SHIELDS_IO_NAME="$( echo -e "${SHIELDS_IO_NAME//\#/%23}")"
-curl "https://img.shields.io/badge/${SHIELDS_IO_NAME}" > "${BADGE_FILENAME}"
-echo "https://img.shields.io/badge/${SHIELDS_IO_NAME}"
-SHIELDS_IO_NAME_RECENT="RECENT:${SHIELDS_IO_NAME}"
-curl "https://img.shields.io/badge/${SHIELDS_IO_NAME_RECENT}" > "${RECENT_BADGE_FILENAME}"
-echo "${SHIELDS_IO_NAME_RECENT}" > testRecentName.txt
+SHIELDS_IO_NAME="https://img.shields.io/static/v1?label=${BADGE_STATUS}&message=${BADGE_SUBJECT}&color=${BADGE_COLOR}"
+SHIELDS_IO_NAME="$( echo -e "${SHIELDS_IO_NAME// /%20}" )"
+echo "${SHIELDS_IO_NAME}"
+curl "${SHIELDS_IO_NAME}" > "${BADGE_FILENAME}"
+SHIELDS_IO_NAME="https://img.shields.io/static/v1?label=RECENT%3A${BADGE_STATUS}&message=${BADGE_SUBJECT}&color=${BADGE_COLOR}"
+SHIELDS_IO_NAME="$( echo -e "${SHIELDS_IO_NAME// /%20}" )"
+echo "${SHIELDS_IO_NAME}" > testRecentName.txt
+echo "${SHIELDS_IO_NAME}"
+curl "${SHIELDS_IO_NAME}" > "${RECENT_BADGE_FILENAME}"
 
 #
 if [[ ! -d ./badges ]]; then