diff --git a/images/k3s/aio.tf b/images/k3s/aio.tf
index 0073327cb..5a9788c1c 100644
--- a/images/k3s/aio.tf
+++ b/images/k3s/aio.tf
@@ -4,12 +4,13 @@ module "config-aio" {
 }
 
 module "latest-aio" {
-  source            = "../../tflib/publisher"
-  name              = basename(path.module)
-  target_repository = "${var.target_repository}-allinone"
-  config            = module.config-aio.config
-  build-dev         = true
-  main_package      = "k3s"
+  source             = "../../tflib/publisher"
+  name               = basename(path.module)
+  target_repository  = "${var.target_repository}-allinone"
+  config             = module.config-aio.config
+  build-dev          = true
+  main_package       = "k3s"
+  extra_dev_packages = ["bash-completion"]
 }
 
 module "tagger-aio" {
diff --git a/images/k3s/k3s.tf b/images/k3s/k3s.tf
index 409e3a240..2fcc0582b 100644
--- a/images/k3s/k3s.tf
+++ b/images/k3s/k3s.tf
@@ -4,12 +4,13 @@ module "config" {
 }
 
 module "latest" {
-  source            = "../../tflib/publisher"
-  name              = basename(path.module)
-  target_repository = var.target_repository
-  config            = module.config.config
-  build-dev         = true
-  main_package      = "k3s"
+  source             = "../../tflib/publisher"
+  name               = basename(path.module)
+  target_repository  = var.target_repository
+  config             = module.config.config
+  build-dev          = true
+  main_package       = "k3s"
+  extra_dev_packages = ["bash-completion"]
 }
 
 module "test-latest" {
diff --git a/images/k3s/static.tf b/images/k3s/static.tf
index 16d128993..dac84c30d 100644
--- a/images/k3s/static.tf
+++ b/images/k3s/static.tf
@@ -4,12 +4,13 @@ module "config-static" {
 }
 
 module "latest-static" {
-  source            = "../../tflib/publisher"
-  name              = basename(path.module)
-  target_repository = "${var.target_repository}-static"
-  config            = module.config-static.config
-  build-dev         = true
-  main_package      = "k3s-static"
+  source             = "../../tflib/publisher"
+  name               = basename(path.module)
+  target_repository  = "${var.target_repository}-static"
+  config             = module.config-static.config
+  build-dev          = true
+  main_package       = "k3s-static"
+  extra_dev_packages = ["bash-completion"]
 }
 
 # Statically linked checks are performed at the package level, so just verify
diff --git a/images/kubectl/main.tf b/images/kubectl/main.tf
index 41f9757c4..cf9374092 100644
--- a/images/kubectl/main.tf
+++ b/images/kubectl/main.tf
@@ -16,7 +16,7 @@ module "latest" {
   target_repository  = var.target_repository
   config             = module.latest-config.config
   build-dev          = true
-  extra_dev_packages = ["kustomize"]
+  extra_dev_packages = ["kustomize", "bash-completion"]
 }
 
 module "test-latest" {