diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a1c14a1..90577b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,7 +7,7 @@ variables:
   MENDER_ARTIFACT_VERSION: master
   MENDER_CLIENT_VERSION: latest
   MENDER_ADDON_CONNECT_VERSION: latest
-  MENDER_ADDON_CONFIGURE_VERSION: master
+  MENDER_ADDON_CONFIGURE_VERSION: latest
   # Make sure to update the link in mender-docs to the new one when changing
   # this.
   RASPBIAN_URL: https://downloads.raspberrypi.org/raspios_lite_armhf/images/raspios_lite_armhf-2021-01-12/2021-01-11-raspios-buster-armhf-lite.zip
diff --git a/configs/mender_convert_config b/configs/mender_convert_config
index 9e71b2b..a8010e7 100644
--- a/configs/mender_convert_config
+++ b/configs/mender_convert_config
@@ -136,8 +136,7 @@ MENDER_ADDON_CONFIGURE_INSTALL="n"
 # Mender Configure addon version
 #
 # Valid values are "latest" (default), "master" or a specific version
-#MENDER_ADDON_CONFIGURE_VERSION="latest"
-MENDER_ADDON_CONFIGURE_VERSION="master"
+MENDER_ADDON_CONFIGURE_VERSION="latest"
 
 # File storage, containing binary files, do not modify this unless you know
 # what you are doing.