diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3da9359..ad131fb 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,10 +4,9 @@ variables:
   S3_BUCKET_NAME: mender-convert-images
   # These variables are present elsewhere in the repository too. Make sure to
   # search for and change them too.
-  MENDER_ARTIFACT_VERSION: 3.5.0-build2
-  MENDER_CLIENT_VERSION: 2.5.0-build2
-  # MENDER_ADDON_CONNECT_VERSION: latest
-  MENDER_ADDON_CONNECT_VERSION: 1.0.0-build2
+  MENDER_ARTIFACT_VERSION: 3.5.x
+  MENDER_CLIENT_VERSION: latest
+  MENDER_ADDON_CONNECT_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-2020-05-28/2020-05-27-raspios-buster-lite-armhf.zip
diff --git a/Dockerfile b/Dockerfile
index 7766d0a..c41644b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,7 +11,7 @@ RUN cd /root/pxz && make
 
 FROM ubuntu:20.04
 
-ARG MENDER_ARTIFACT_VERSION=master
+ARG MENDER_ARTIFACT_VERSION=3.5.x
 
 RUN apt-get update && env DEBIAN_FRONTEND=noninteractive apt-get install -y \
 # For 'ar' command to unpack .deb
diff --git a/configs/mender_convert_config b/configs/mender_convert_config
index d4c3d25..62bb90b 100644
--- a/configs/mender_convert_config
+++ b/configs/mender_convert_config
@@ -128,8 +128,7 @@ MENDER_ADDON_CONNECT_INSTALL="n"
 # Mender Connect addon version
 #
 # Valid values are "latest" (default), "master" or a specific version
-# MENDER_ADDON_CONNECT_VERSION="latest"
-MENDER_ADDON_CONNECT_VERSION="master"
+MENDER_ADDON_CONNECT_VERSION="latest"
 
 # File storage, containing binary files, do not modify this unless you know
 # what you are doing.