diff --git a/pkg/images/images.go b/pkg/images/images.go
index 33358c20ec..12b8eabf0d 100644
--- a/pkg/images/images.go
+++ b/pkg/images/images.go
@@ -23,9 +23,9 @@ var (
 	runtime           = os.Getenv("RKE2_RUNTIME_IMAGE")
 	etcd              = os.Getenv("RKE2_ETCD_IMAGE")
 
-	KubernetesVersion = "v1.18.8" // make sure this matches what is in the scripts/version.sh script
-	PauseVersion      = "3.2"     // make sure this matches what is in the scripts/build-images script
-	EtcdVersion       = "v3.4.13" // make sure this matches what is in the scripts/build-images script
+	KubernetesVersion = "v1.18.8"      // make sure this matches what is in the scripts/version.sh script
+	PauseVersion      = "3.2"          // make sure this matches what is in the scripts/build-images script
+	EtcdVersion       = "v3.4.13-k3s1" // make sure this matches what is in the scripts/build-images script
 	RuntimeImageName  = "rke2-runtime"
 )
 
diff --git a/scripts/build-images b/scripts/build-images
index 6b2f502197..1a2ee4e7d4 100755
--- a/scripts/build-images
+++ b/scripts/build-images
@@ -11,7 +11,7 @@ source ./scripts/version.sh
 xargs -n1 -t docker image pull --quiet << EOF > build/images.txt
     docker.io/rancher/calico:v3.13.3
     docker.io/rancher/coredns:v1.6.9
-    docker.io/rancher/etcd:v3.4.13
+    docker.io/rancher/etcd:v3.4.13-k3s1
     docker.io/rancher/flannel:v0.13.0-rancher1-rc1
     docker.io/rancher/k8s-metrics-server:v0.3.6
     docker.io/rancher/klipper-helm:v0.3.0