From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1EFFC1DF75C
	for <kdevops@lists.linux.dev>; Fri,  2 May 2025 12:13:47 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201
ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
	t=1746188028; cv=none; b=ggajKxez28UsFAJSrnV9sJsH4gE7sw4SfKTOTiRSNvk5OS5Mzkc6qtvCagc4GTKkyzDSn9tRTLRaRUQ1UW4Bhu3VDphEixXpfKIoCbbFe5BTA8tlO6WNxs3XLNbEykvosSJuwi7cznDkwiLL3nnAJGDrPVsQz0U+DuDH11ls4gY=
ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org;
	s=arc-20240116; t=1746188028; c=relaxed/simple;
	bh=HIb98qUQ8HMsd7hZYwrx88XfLeVp6Gc1EBw3Xo/uhGY=;
	h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References:
	 In-Reply-To:To:Cc; b=OnMdIGNHfh23gXAQ+E9FlEPmUl67+h5rRozd+/6kMlapGGv1hkrLoy6G2p1v3xWVUdG6UArQ/GZO3Uyf0MaNr4jJA0Gv7dQCajgqwQ2kHjRTH/FXM858tODHK5VJQ+E5sXWc279G+Wy8rfxrKrTSYQHKOKcEpbxCT8kQtDEXM50=
ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=tBtB9kNu; arc=none smtp.client-ip=10.30.226.201
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="tBtB9kNu"
Received: by smtp.kernel.org (Postfix) with ESMTPSA id 89BB5C4CEEF;
	Fri,  2 May 2025 12:13:46 +0000 (UTC)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org;
	s=k20201202; t=1746188027;
	bh=HIb98qUQ8HMsd7hZYwrx88XfLeVp6Gc1EBw3Xo/uhGY=;
	h=From:Date:Subject:References:In-Reply-To:To:Cc:From;
	b=tBtB9kNugS9L98G6uIxWW2l0uwP1Dm6yG1mSqrYaUjU2HyVUtAba1qAyU4Jn0q3a4
	 bj3UKo389Dsblxfgy312bIts+6evjD1pNdUqSdEnx1fWsNa7Ln2kbiqQOJ2/s6GO63
	 u7Ndy4LlExTJNHKVa0z46SHjnuhjQBHH14hBUQKRWhUB03AwdJ2fIwzJd2vTdoFxKm
	 /2OGDI+SwUpH4gNE9CX+AO+OLaq6PwqdA81QFVpfOQ3z9Q4eFCLmqpUPLcaYZ+sIfW
	 C6mkVeWaal36Csn1GRVIgXsESTS+VjM37gcjvhVK8PnOL6hhzLanKNhohKo74khYFj
	 pqPIsLFQWowrw==
From: Daniel Gomez <da.gomez@kernel.org>
Date: Fri, 02 May 2025 14:13:25 +0200
Subject: [PATCH v2 08/10] Makefile: use inventory from ansible.cfg
Precedence: bulk
X-Mailing-List: kdevops@lists.linux.dev
List-Id: <kdevops.lists.linux.dev>
List-Subscribe: <mailto:kdevops+subscribe@lists.linux.dev>
List-Unsubscribe: <mailto:kdevops+unsubscribe@lists.linux.dev>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit
Message-Id: <20250502-ansible_cfg_inventory-v2-8-d3c19ff4aa6e@samsung.com>
References: <20250502-ansible_cfg_inventory-v2-0-d3c19ff4aa6e@samsung.com>
In-Reply-To: <20250502-ansible_cfg_inventory-v2-0-d3c19ff4aa6e@samsung.com>
To: Luis Chamberlain <mcgrof@kernel.org>, 
 Chuck Lever <chuck.lever@oracle.com>
Cc: kdevops@lists.linux.dev, Daniel Gomez <da.gomez@kernel.org>, 
 Daniel Gomez <da.gomez@samsung.com>
X-Mailer: b4 0.14.2
X-Developer-Signature: v=1; a=openpgp-sha256; l=65711; i=da.gomez@samsung.com;
 h=from:subject:message-id; bh=woukaD+bPabZ6PS0t5QQrr/jiRV4rWG6I9g6HDgSTL4=;
 b=owEBbQKS/ZANAwAIAYX1bqTp6BOPAcsmYgBoFLbsqi95PQHAflTa5LP6A2YfeQYBl9Gxzc3KC
 hkB65uYm8eJAjMEAAEIAB0WIQSyp6nP3QO1QP9YsnGF9W6k6egTjwUCaBS27AAKCRCF9W6k6egT
 j1zLD/946xPPPOinzanu5niBDdClTZQypisQh4a4/1E+qnDzHfnX+h4Q+XNsKSPG94Iv8Xhaz71
 PqF+qODq+ite1vh0g5tQ2geV/eqQAcdiimsq5EHRp2K95WwO8Ce1qhSC6ZBpO8wJWKmZKE+yHLQ
 MMz8LSpBWjgpcox8UcjS5LsNDeUL4Uj01UagQhbs116TYhpZfriRnwe8pc3cpZBhkwpkEt41L9T
 2OvXI4QMMsGKb3hXUuPLybVvwyFCovFTHcaHKStp8xJ+Z6B1PDieGXQzS2uZxVNRu+0Qsl5JHeN
 QP2YwiwQLkxdgDNM+YIRwkPi5JHWBaTcCfjlHsm3wgzPhuab4hb4Q5ReZJHaxY5TErcbD1HZywD
 hFAtTCv/PcVYHZb3sasOVmpj3WMqllexXrC+MCefzPbvdvGDNOWVATqANCDTu0oeos7FNehGp4G
 Mm7Q7Q5tgITGPPXwuC2qE54P0UZg6nCj3kpyJkX7cY1zfE+Cd4CTUEelRdSdbfibyNgJAWeCiOY
 l7KLw6Ung8d1nlHuFo6tfn5JrIxRTz++vhfrOtaqHKHPSfNRrn3MJtgWnkNy0co4PpCg6ySrHc8
 YV6g5lA1O4CgeWzx7ZyMuDiJPKcs3jyJ9SR3PE0xk26Y2Ni/0yUrkim6Y5xMpbEVINlZ9UDZxOP
 RXCqzuDFDQqju5w==
X-Developer-Key: i=da.gomez@samsung.com; a=openpgp;
 fpr=B2A7A9CFDD03B540FF58B27185F56EA4E9E8138F

From: Daniel Gomez <da.gomez@samsung.com>

We can define the Ansible inventory via ansible.cfg inventory variable.
Make use of it and remove all the -i/--inventory arguments in all the
ansible-playbook calls.

Target control is now handled in 2 different ways:
- At playbook (hosts: <targets>): E.g. all, all!localhost (all targets
except localhost), localhost. An alternative to all!localhost is to
define all the groups such as baseline,dev. The former option was chosen
for brevity.

So, most of the playbooks have been converted from all ->
all!localhosts. Except for bootlinux playbook, where all is kept as
the playbook runs limited to localhost in linux-clone-9p and limited to
all:!localhosts for the rest of the targets.

- At command line: ansible-playbook --limit 'SUBSET'. In order to
control the hosts when the playbook defines something wider (such as the
case where we want to run only on baseline targets for example), we use
the ansible-playbook argument --limit.

Use --limits argument with the proper syntax [1]: with quotes and colons
(for list of targets or group of targets).

Ensure the target string written to the file excludes the double quotes.
Their presence caused the Makefile target to be triggered every time.

[1]
https://docs.ansible.com/ansible/latest/inventory_guide/intro_patterns.html

Signed-off-by: Daniel Gomez <da.gomez@samsung.com>
---
 Makefile                                        | 21 ++++-----
 Makefile.btrfs_progs                            |  4 +-
 Makefile.build_qemu                             | 12 ++---
 Makefile.hypervisor-tunings                     |  3 +-
 Makefile.kdevops                                | 19 +++-----
 Makefile.linux-mirror                           |  6 +--
 Makefile.postfix                                |  3 +-
 playbooks/roles/gen_hosts/defaults/main.yml     |  1 -
 playbooks/roles/gen_hosts/tasks/main.yml        | 52 ++++++++++-----------
 playbooks/roles/update_etc_hosts/tasks/main.yml |  2 +-
 scripts/archive.Makefile                        |  3 +-
 scripts/devconfig.Makefile                      |  8 ++--
 scripts/dynamic-pci-kconfig.Makefile            |  3 +-
 scripts/firstconfig.Makefile                    |  5 +-
 scripts/gen-hosts.Makefile                      |  1 -
 scripts/guestfs.Makefile                        | 17 +++----
 scripts/install-menuconfig-deps.Makefile        |  3 +-
 scripts/iscsi.Makefile                          |  2 +-
 scripts/journal-server.Makefile                 | 23 ++++++----
 scripts/kotd.Makefile                           | 16 ++++---
 scripts/krb5.Makefile                           |  4 +-
 scripts/ktls.Makefile                           |  1 -
 scripts/nfsd.Makefile                           |  2 +-
 scripts/provision.Makefile                      |  5 +-
 scripts/rdma.Makefile                           |  2 -
 scripts/smbd.Makefile                           |  2 +-
 scripts/systemd-timesync.Makefile               |  8 ++--
 scripts/terraform.Makefile                      |  6 +--
 scripts/update_etc_hosts.Makefile               |  2 +-
 scripts/vagrant.Makefile                        | 10 ++--
 scripts/workflows/lib/crash.py                  |  4 +-
 workflows/blktests/Makefile                     | 20 +++++---
 workflows/common/Makefile                       |  2 +-
 workflows/cxl/Makefile                          | 14 +++---
 workflows/demos/reboot-limit/Makefile           | 32 ++++++++-----
 workflows/fstests/Makefile                      | 40 ++++++++++------
 workflows/gitr/Makefile                         |  8 ++--
 workflows/linux/Makefile                        | 61 ++++++++++++++++---------
 workflows/ltp/Makefile                          |  8 ++--
 workflows/nfstest/Makefile                      |  8 ++--
 workflows/pynfs/Makefile                        | 12 ++---
 workflows/selftests/Makefile                    | 11 +++--
 workflows/sysbench/Makefile                     | 12 ++---
 43 files changed, 248 insertions(+), 230 deletions(-)

diff --git a/Makefile b/Makefile
index 7d522d5f918cf81da6fec9258c8c174e48fed11a..de0db3cc9137f749fa205acce5487073f998f789 100644
--- a/Makefile
+++ b/Makefile
@@ -15,7 +15,6 @@ include Makefile.subtrees
 
 export KDEVOPS_EXTRA_VARS ?=			extra_vars.yaml
 export KDEVOPS_PLAYBOOKS_DIR :=			playbooks
-export KDEVOPS_HOSTFILE ?=			hosts
 export KDEVOPS_NODES :=
 export KDEVOPS_VAGRANT :=
 export PYTHONUNBUFFERED=1
@@ -27,6 +26,8 @@ KDEVOPS_NODES_ROLE_TEMPLATE_DIR :=		$(KDEVOPS_PLAYBOOKS_DIR)/roles/gen_nodes/tem
 export KDEVOPS_NODES_TEMPLATE :=
 export KDEVOPS_MRPROPER :=
 
+ANSIBLE_INVENTORY_FILE := $(shell echo $(CONFIG_ANSIBLE_CFG_INVENTORY) | tr --delete '"')
+
 KDEVOPS_INSTALL_TARGETS :=
 
 DEFAULT_DEPS :=
@@ -79,8 +80,7 @@ CFLAGS += $(INCLUDES)
 
 ANSIBLE_EXTRA_ARGS += kdevops_version='$(PROJECTRELEASE)'
 
-export KDEVOPS_HOSTS_TEMPLATE := $(KDEVOPS_HOSTFILE).j2
-export KDEVOPS_HOSTS := $(KDEVOPS_HOSTFILE)
+export KDEVOPS_HOSTS_TEMPLATE := hosts.j2
 
 LOCAL_DEVELOPMENT_ARGS	:=
 ifeq (y,$(CONFIG_NEEDS_LOCAL_DEVELOPMENT_PATH))
@@ -198,8 +198,7 @@ include scripts/gen-nodes.Makefile
 
 PHONY += ansible.cfg
 ansible.cfg:
-	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	@$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ansible_cfg.yml \
 		--extra-vars=@./.extra_vars_auto.yaml
 
@@ -227,17 +226,15 @@ ifneq (,$(KDEVOPS_BRING_UP_DEPS))
 include scripts/bringup.Makefile
 endif
 
-DEFAULT_DEPS += $(KDEVOPS_HOSTS)
-$(KDEVOPS_HOSTS): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+DEFAULT_DEPS += $(ANSIBLE_INVENTORY_FILE)
+$(ANSIBLE_INVENTORY_FILE): .config ansible.cfg $(KDEVOPS_HOSTS_TEMPLATE)
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gen_hosts.yml \
 		--extra-vars=@./extra_vars.yaml
 
 DEFAULT_DEPS += $(KDEVOPS_NODES)
 $(KDEVOPS_NODES) $(KDEVOPS_VAGRANT): .config ansible.cfg $(KDEVOPS_NODES_TEMPLATE)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gen_nodes.yml \
 		--extra-vars=@./extra_vars.yaml
 
@@ -263,7 +260,7 @@ mrproper:
 	$(Q)rm -f terraform/*/terraform.tfvars
 	$(Q)rm -rf terraform/*/.terraform
 	$(Q)rm -f $(KDEVOPS_NODES)
-	$(Q)rm -f $(KDEVOPS_HOSTFILE) $(KDEVOPS_MRPROPER)
+	$(Q)rm -f $(ANSIBLE_CFG_INVENTORY) $(KDEVOPS_MRPROPER)
 	$(Q)rm -f .config .config.old extra_vars.yaml $(KCONFIG_YAMLCFG)
 	$(Q)rm -f ansible.cfg
 	$(Q)rm -f playbooks/secret.yml $(KDEVOPS_EXTRA_ADDON_DEST)
diff --git a/Makefile.btrfs_progs b/Makefile.btrfs_progs
index 73a1c95f169a67637cc65febf417b61b967e4668..9ccfafa360eab112e13588ab1908209f62247406 100644
--- a/Makefile.btrfs_progs
+++ b/Makefile.btrfs_progs
@@ -5,8 +5,8 @@ BTRFS_PROGS_SETUP_ARGS += btrfs_progs_build=True
 
 PHONY += btrfs-progs
 btrfs-progs: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/btrfs-progs.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		$(KDEVOPS_PLAYBOOKS_DIR)/btrfs-progs.yml \
 		--extra-vars=$(BTRFS_PROGS_SETUP_ARGS) $(LIMIT_HOSTS)
 
 btrfs-progs-help-menu:
diff --git a/Makefile.build_qemu b/Makefile.build_qemu
index 72e1cba4dfbccccf8c546c613b788a26be86ee3f..2eac6e9b56f7f9c67dbff079309b97fab52bee3e 100644
--- a/Makefile.build_qemu
+++ b/Makefile.build_qemu
@@ -20,29 +20,25 @@ QEMU_BUILD_SETUP_ARGS += qemu_target="ppc64-softmmu"
 endif
 
 qemu: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
 		--extra-vars=@./extra_vars.yaml
 PHONY += qemu
 
 qemu-install: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,install
 PHONY += qemu-install
 
 qemu-configure: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,configure
 PHONY += qemu-configure
 
 qemu-build: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/build_qemu.yml \
 		--extra-vars=@./extra_vars.yaml --tags vars,build
 PHONY += qemu-build
diff --git a/Makefile.hypervisor-tunings b/Makefile.hypervisor-tunings
index 39547c02f1b68a5bfb4ea770f37e4d3563109532..ff29b89cfbc93c0d5416e8c4bdf6842cbfd2d697 100644
--- a/Makefile.hypervisor-tunings
+++ b/Makefile.hypervisor-tunings
@@ -14,8 +14,7 @@ HYPERVISOR_TUNING_ARGS += hypervisor_tunning_zswap_max_pool_percent=$(ZSWAP_MAX_
 endif
 
 kdevops_hypervisor_tunning: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/hypervisor-tuning.yml \
 		--extra-vars=@./extra_vars.yaml
 PHONY += kdevops_hypervisor_tunning
diff --git a/Makefile.kdevops b/Makefile.kdevops
index 60d79a5a3e48e25fbda6647e86abc25fcd5611f3..7a156312176048edf37e903323a01c48a642d2f2 100644
--- a/Makefile.kdevops
+++ b/Makefile.kdevops
@@ -2,26 +2,22 @@
 # allow your project to define these and just include this file.
 KDEVOPS_TERRAFORM_DIR ?=	terraform
 KDEVOPS_PLAYBOOKS_DIR ?=	playbooks
-KDEVOPS_HOSTFILE ?=		hosts
 KDEVOPS_LOCAL_WORK :=
 
 kdevops_all: kdevops_deps
 PHONY := kdevops_all
 
 kdevops_terraform_deps:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/install_terraform.yml
 PHONY += kdevops_terraform_deps
 
 kdevops_install_libvirt:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_configuration=True"
 
 kdevops_configure_libvirt:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "skip_install=True" \
 		-e 'running_user=$(USER)'
 
@@ -33,23 +29,20 @@ PHONY += kdevops_vagrant_deps
 KDEVOPS_VAGRANT_WORK := kdevops_vagrant_deps
 
 kdevops_vagrant_boxes:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml
 PHONY += kdevops_vagrant_boxes
 KDEVOPS_VAGRANT_WORK += kdevops_vagrant_boxes
 
 kdevops_verify_libvirt_user:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_user.yml -e "only_verify_user=True"
 
 PHONY += kdevops_verify_libvirt_user
 KDEVOPS_VAGRANT_WORK += kdevops_verify_libvirt_user
 
 kdevops_libvirt_storage_pool_create:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/libvirt_storage_pool_create.yml
 
 PHONY += kdevops_libvirt_storage_pool_create
diff --git a/Makefile.linux-mirror b/Makefile.linux-mirror
index 6961a55b47ce0796b39841ae125f52f07f11a96f..ccda361ba17396aad80c5cf846a5a21ec155450b 100644
--- a/Makefile.linux-mirror
+++ b/Makefile.linux-mirror
@@ -25,8 +25,7 @@ endif
 MIRROR_CODE      := $(TOPDIR)/playbooks/roles/linux-mirror/linux-mirror-systemd/
 
 kdevops_linux_mirror: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook \
 		--tags vars,mirror \
 		$(KDEVOPS_PLAYBOOKS_DIR)/linux-mirror.yml \
 		--extra-vars=@./extra_vars.yaml
@@ -37,8 +36,7 @@ mirror: $(KDEVOPS_EXTRA_VARS) kdevops_linux_mirror
 PHONY += mirror
 
 mirror-status: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook \
 		--tags vars,mirror-status \
 		$(KDEVOPS_PLAYBOOKS_DIR)/linux-mirror.yml \
 		--extra-vars=@./extra_vars.yaml
diff --git a/Makefile.postfix b/Makefile.postfix
index 5db23dc973711dfbd697d5b353e64e257c8f1d0d..704c71550bd0cc0f724aaef2e64db071ca99e92e 100644
--- a/Makefile.postfix
+++ b/Makefile.postfix
@@ -7,8 +7,7 @@ POSTFIX_SETUP_ARGS += postfix_relay_host_setup=True
 POSTFIX_SETUP_ARGS += postfix_relay_host=$(POSTFIX_RELAY_HOST)
 
 kdevops_postfix_setup_relay: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/postfix_relay_host.yml \
 		--extra-vars=@./extra_vars.yaml
 PHONY += kdevos_postfix_setup_relay
diff --git a/playbooks/roles/gen_hosts/defaults/main.yml b/playbooks/roles/gen_hosts/defaults/main.yml
index f6ab9bcce1669b28bb04f8139f07e3d8091a2a88..1a2f737a63462ce90b868578577f7d1f1575e05c 100644
--- a/playbooks/roles/gen_hosts/defaults/main.yml
+++ b/playbooks/roles/gen_hosts/defaults/main.yml
@@ -6,7 +6,6 @@ hosts_type_generic: True
 hosts_type_fs: False
 hosts_type_block: False
 
-kdevops_hosts: "hosts"
 kdevops_hosts_template: "hosts.in"
 kdevops_playbooks_dir: "/dev/null"
 kdevops_genhosts_templates_dir: "/dev/null"
diff --git a/playbooks/roles/gen_hosts/tasks/main.yml b/playbooks/roles/gen_hosts/tasks/main.yml
index a50355f721606a7da961b54ec29b16875391eca9..d20e48998a7789721eb919756755e79e7370ead7 100644
--- a/playbooks/roles/gen_hosts/tasks/main.yml
+++ b/playbooks/roles/gen_hosts/tasks/main.yml
@@ -18,23 +18,23 @@
   command: "id -g -n"
   register: my_group
 
-- name: Check if the file {{ kdevops_hosts }} exists already
+- name: Check if the inventory file exists already
   stat:
-    path: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    path: "{{ ansible_cfg_inventory }}"
   register: kdevops_hosts_dest
 
-- name: Ensure proper permission on the file {{ kdevops_hosts }}
+- name: Ensure proper permission on the inventory file
   become: yes
   become_flags: 'su - -c'
   become_method: sudo
   file:
-    path: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    path: "{{ ansible_cfg_inventory }}"
     owner: "{{ my_user.stdout }}"
     group: "{{ my_group.stdout }}"
   when:
     - kdevops_hosts_dest.stat.exists
 
-- name: Verify Ansible host template file exists {{ kdevops_hosts_template_full_path }}
+- name: Verify Ansible inventory template file exists
   stat:
     path: "{{ kdevops_hosts_template_full_path }}"
   register: ansible_hosts_template
@@ -56,11 +56,11 @@
   when:
     - is_fstests
 
-- name: Generate the Ansible hosts file
+- name: Generate the Ansible inventory file
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -68,11 +68,11 @@
     - not kdevops_workflows_dedicated_workflow
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for dedicated cxl work
+- name: Generate the Ansible inventory file for dedicated cxl work
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ anisble_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -81,11 +81,11 @@
     - kdevops_workflow_enable_cxl
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for dedicated pynfs work
+- name: Generate the Ansible inventory file for dedicated pynfs work
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -94,13 +94,13 @@
     - kdevops_workflow_enable_pynfs
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for dedicated gitr workflow
+- name: Generate the Ansible inventory file for dedicated gitr workflow
   tags: [ 'hosts' ]
   vars:
     gitr_enabled_hosts: "{{ gitr_enabled_test_groups|ansible.builtin.split }}"
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: true
     trim_blocks: true
     lstrip_blocks: true
@@ -109,13 +109,13 @@
     - kdevops_workflow_enable_gitr
     - ansible_hosts_template.stat.exists
 
-- name: Generate an Ansible hosts file for a dedicated ltp workflow
+- name: Generate an Ansible inventory file for a dedicated ltp workflow
   tags: [ 'hosts' ]
   vars:
     ltp_enabled_hosts: "{{ ltp_enabled_test_groups|ansible.builtin.split }}"
   ansible.builtin.template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -124,13 +124,13 @@
     - kdevops_workflow_enable_ltp
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for dedicated nfstest workflow
+- name: Generate the Ansible inventory file for dedicated nfstest workflow
   tags: [ 'hosts' ]
   vars:
     nfstest_enabled_hosts: "{{ nfstest_enabled_test_groups | ansible.builtin.split }}"
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: true
     trim_blocks: true
     lstrip_blocks: true
@@ -183,7 +183,7 @@
     - ansible_hosts_template.stat.exists
     - item.changed
 
-- name: Generate the Ansible hosts file for a dedicated fstests setup
+- name: Generate the Ansible inventory file for a dedicated fstests setup
   tags: [ 'hosts' ]
   vars:
     fs_config_data: "{{ lookup('file', fs_config_path) }}"
@@ -194,7 +194,7 @@
     sections: "{{ sections_replace_underscore |  replace(\"'\", '') | split(', ') }}"
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -224,11 +224,11 @@
     - kdevops_workflow_enable_blktests
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for a dedicated blktests setup
+- name: Generate the Ansible inventory file for a dedicated blktests setup
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -250,11 +250,11 @@
     - kdevops_workflow_enable_selftests
     - ansible_hosts_template.stat.exists
 
-- name: Generate the Ansible hosts file for a dedicated selftests setup
+- name: Generate the Ansible inventory file for a dedicated selftests setup
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -291,11 +291,11 @@
     - kdevops_workflows_dedicated_workflow
     - kdevops_workflow_enable_sysbench
 
-- name: Generate the Ansible hosts file for a dedicated sysbench setup
+- name: Generate the Ansible inventory file for a dedicated sysbench setup
   tags: [ 'hosts' ]
   template:
     src: "{{ kdevops_hosts_template }}"
-    dest: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    dest: "{{ ansible_cfg_inventory }}"
     force: yes
     trim_blocks: True
     lstrip_blocks: True
@@ -306,7 +306,7 @@
 
 - name: Verify if final host file exists
   stat:
-    path: "{{ topdir_path }}/{{ kdevops_hosts }}"
+    path: "{{ ansible_cfg_inventory }}"
   register: final_hosts_file
 
 - name: Fail if the dedicated workflow has no rules for node configuration for hosts file configuration
diff --git a/playbooks/roles/update_etc_hosts/tasks/main.yml b/playbooks/roles/update_etc_hosts/tasks/main.yml
index 4c1307fb7c62c9e8db0bceb9847081c330f49f53..2b9af91debb601637ff8fc9cc82fd4a41bb2f5c9 100644
--- a/playbooks/roles/update_etc_hosts/tasks/main.yml
+++ b/playbooks/roles/update_etc_hosts/tasks/main.yml
@@ -26,7 +26,7 @@
 
 - name: Build list of hosts
   set_fact:
-    ueh_hosts: "{{ groups.all | flatten(levels=1) | reject('eq', inventory_hostname) }}"
+    ueh_hosts: "{{ ansible_play_hosts_all | difference([inventory_hostname]) }}"
 
 - debug:
     var: ueh_hosts
diff --git a/scripts/archive.Makefile b/scripts/archive.Makefile
index 54928d328472bb89e03ea0b11c259dbfabbe1c09..23a693d793f3c0659b6f42bc5eb222c560d1d37b 100644
--- a/scripts/archive.Makefile
+++ b/scripts/archive.Makefile
@@ -13,8 +13,7 @@ ARCHIVE_DYNAMIC_RUNTIME_VARS += \
 endif
 
 ci-archive:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/kdevops_archive.yml \
 		--extra-vars '{ $(ARCHIVE_DYNAMIC_RUNTIME_VARS) }' \
 		--extra-vars=@./extra_vars.yaml
diff --git a/scripts/devconfig.Makefile b/scripts/devconfig.Makefile
index bdff088589cd240717023f79d7adf349f196a463..7b80db0aa910193068de3f6e57205e4b2c5f9856 100644
--- a/scripts/devconfig.Makefile
+++ b/scripts/devconfig.Makefile
@@ -56,8 +56,8 @@ extend-extra-args-devconfig:
 
 PHONY += devconfig
 devconfig: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i $(KDEVOPS_HOSTFILE) \
-		-l all,nfsd \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" \
 		--extra-vars '{ kdevops_cli_install: True }' \
@@ -71,8 +71,8 @@ HELP_TARGETS+=devconfig-generic-help-menu
 ifeq (y,$(CONFIG_SYSCTL_TUNING))
 PHONY += sysctl-tunings
 sysctl-tunings: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i $(KDEVOPS_HOSTFILE) \
-		-l all,nfsd \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,sysctl
 
diff --git a/scripts/dynamic-pci-kconfig.Makefile b/scripts/dynamic-pci-kconfig.Makefile
index 716cdc1e4814a26532c8bb3550670cdd1e4caf3a..8902da29e53d8a34df077f72f4969565f867ae3c 100644
--- a/scripts/dynamic-pci-kconfig.Makefile
+++ b/scripts/dynamic-pci-kconfig.Makefile
@@ -42,8 +42,7 @@ endif # CONFIG_KDEVOPS_LIBVIRT_PCIE_PASSTHROUGH
 HELP_TARGETS += dynamic-kconfig-pci-help
 
 dynamic_pcipassthrough_kconfig:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/gen-pci-kconfig.yml \
 		--extra-vars '{ $(PCIE_RUNTIME_VARS) }'
 
diff --git a/scripts/firstconfig.Makefile b/scripts/firstconfig.Makefile
index f1a4423e6d96f551f2ae8652fa2f8a08bc06fce8..9f8a63a8ff849decf2256a24d3c756664ef07d61 100644
--- a/scripts/firstconfig.Makefile
+++ b/scripts/firstconfig.Makefile
@@ -1,8 +1,9 @@
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
 firstconfig:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --extra-vars '{ kdevops_cli_install: True }' \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--extra-vars '{ kdevops_cli_install: True }' \
 		--tags vars_simple,firstconfig \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
diff --git a/scripts/gen-hosts.Makefile b/scripts/gen-hosts.Makefile
index 84e47fd73c9b716abd9b2e4ba52aa548dc6e59d8..0d1e0cd77c2ed92b5df678012e292ff386f3af2e 100644
--- a/scripts/gen-hosts.Makefile
+++ b/scripts/gen-hosts.Makefile
@@ -4,7 +4,6 @@ KDEVOPS_PLAYBOOKS_DIR_FULL_PATH=$(TOPDIR_PATH)/$(KDEVOPS_PLAYBOOKS_DIR)
 KDEVOPS_HOSTS_TEMPLATE_DIR=$(KDEVOPS_PLAYBOOKS_DIR_FULL_PATH)/roles/gen_hosts/templates
 
 GENHOSTS_EXTRA_ARGS += kdevops_playbooks_dir='$(KDEVOPS_PLAYBOOKS_DIR)'
-GENHOSTS_EXTRA_ARGS += kdevops_hosts='$(KDEVOPS_HOSTFILE)'
 
 # Relative path so that ansible can work with it
 KDEVOPS_HOSTS_TEMPLATE_SHORT:=$(KDEVOPS_HOSTS_TEMPLATE)
diff --git a/scripts/guestfs.Makefile b/scripts/guestfs.Makefile
index 39ff06efae31e4ff6a8fe23bfa2fbb11707f97a8..60e50b4f93ef1f2158748731e0e86d4d054fbf86 100644
--- a/scripts/guestfs.Makefile
+++ b/scripts/guestfs.Makefile
@@ -51,38 +51,33 @@ KDEVOPS_PROVISION_DESTROY_METHOD	:= destroy_guestfs
 	$(Q)make linux-clone
 
 libvirt_pcie_passthrough_permissions:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/libvirt_pcie_passthrough.yml
 
 $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
-		ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-			--inventory localhost, \
+		ansible-playbook $(ANSIBLE_VERBOSE) \
 			playbooks/update_ssh_config_guestfs.yml \
 			--extra-vars=@./extra_vars.yaml; \
 			LIBVIRT_DEFAULT_URI=$(CONFIG_LIBVIRT_URI) \
 			$(TOPDIR)/scripts/update_ssh_config_guestfs.py; \
 	fi
-	$(Q)ansible $(ANSIBLE_VERBOSE) -i hosts 'all:!localhost' -m wait_for_connection
+	$(Q)ansible $(ANSIBLE_VERBOSE) 'all:!localhost' -m wait_for_connection
 	$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
 
 install_libguestfs:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/bringup_guestfs.yml \
 		--extra-vars=@./extra_vars.yaml \
 		--tags install-deps
 
 bringup_guestfs: $(GUESTFS_BRINGUP_DEPS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/bringup_guestfs.yml \
 		--extra-vars=@./extra_vars.yaml \
 		--tags config-check,network,storage-pool-path
 	$(Q)$(TOPDIR)/scripts/bringup_guestfs.sh
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/bringup_guestfs.yml \
 		--extra-vars=@./extra_vars.yaml \
 		--tags console-permissions
diff --git a/scripts/install-menuconfig-deps.Makefile b/scripts/install-menuconfig-deps.Makefile
index 772e65df2528d1fdd191b7fad4ae68ebe0e35979..4b9aef8db20d63b8ab3ab131bf614ea54b5a6372 100644
--- a/scripts/install-menuconfig-deps.Makefile
+++ b/scripts/install-menuconfig-deps.Makefile
@@ -1,8 +1,7 @@
 # SPDX-License-Identifier: copyleft-next-0.3.1
 
 menuconfig-deps:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/install-menuconfig-deps.yml \
 		-e 'kdevops_first_run=True'
 PHONY += menuconfig-deps
diff --git a/scripts/iscsi.Makefile b/scripts/iscsi.Makefile
index d9ac22befa0277c27c19e52ca548f93d0eb18f70..940dce35df54ff7457a13c51cb07b207168128ae 100644
--- a/scripts/iscsi.Makefile
+++ b/scripts/iscsi.Makefile
@@ -7,7 +7,7 @@ ANSIBLE_EXTRA_ARGS += $(ISCSI_EXTRA_ARGS)
 
 iscsi:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l iscsi \
+		--limit 'iscsi' \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/iscsi.yml
 
diff --git a/scripts/journal-server.Makefile b/scripts/journal-server.Makefile
index da61fa30269826088ef261df91a1f9974f3a9493..d3c39712351dd60ed2f2e3dba9201cd8439c7912 100644
--- a/scripts/journal-server.Makefile
+++ b/scripts/journal-server.Makefile
@@ -11,24 +11,26 @@ ANSIBLE_EXTRA_ARGS += devconfig_systemd_journal_use_http='True'
 endif
 
 journal-client:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --extra-vars '{ kdevops_cli_install: True }' \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--extra-vars '{ kdevops_cli_install: True }' \
 		--tags vars_simple,journal \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
 journal-server:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_journal_remote.yml
 
 journal-restart:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --tags vars_extra,journal-upload-restart \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--tags vars_extra,journal-upload-restart \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
 journal-status:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --tags vars_extra,journal-status \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--tags vars_extra,journal-status \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
 journal-ls:
@@ -39,8 +41,9 @@ journal-dump:
 
 
 journal-ln:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --tags vars_extra,journal_ln \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--tags vars_extra,journal_ln \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
 LOCALHOST_SETUP_WORK += journal-server
diff --git a/scripts/kotd.Makefile b/scripts/kotd.Makefile
index b9b7cf650612d0fb4c28475444ca52b866051c45..c74aad5a1a3c208e7ca74822983b6baf18812cea 100644
--- a/scripts/kotd.Makefile
+++ b/scripts/kotd.Makefile
@@ -9,19 +9,23 @@ endif # HAVE_DISTRO_CUSTOM_KOTD_REPO
 
 ANSIBLE_CMD_KOTD_ENABLE :=
 
-kotd: $(KDEVOPS_HOSTS) .config
+kotd: inventory .config
 	$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/devconfig.yml --tags vars,kotd \
+		playbooks/devconfig.yml --tags vars,kotd \
 		--extra-vars=@./extra_vars.yaml
 
-kotd-baseline: $(KDEVOPS_HOSTS) .config
+kotd-baseline: inventory .config
 	$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/devconfig.yml --tags vars,kotd \
+		--limit 'baseline' \
+		playbooks/devconfig.yml \
+		--tags vars,kotd \
 		--extra-vars=@./extra_vars.yaml
 
-kotd-dev: $(KDEVOPS_HOSTS) .config
+kotd-dev: inventory .config
 	$(Q)$(ANSIBLE_CMD_KOTD_ENABLE)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/devconfig.yml --tags vars,kotd \
+		--limit 'dev' \
+		playbooks/devconfig.yml \
+		--tags vars,kotd \
 		--extra-vars=@./extra_vars.yaml
 
 kotd-help-menu:
diff --git a/scripts/krb5.Makefile b/scripts/krb5.Makefile
index d49e77ba02a8efcf09b8fbc689abe2a09a39c435..eeadadc519b495aefa7732a529d8d1f650108de7 100644
--- a/scripts/krb5.Makefile
+++ b/scripts/krb5.Makefile
@@ -8,13 +8,13 @@ ANSIBLE_EXTRA_ARGS += $(KRB5_EXTRA_ARGS)
 
 kdc:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l kdc \
+		--limit 'kdc' \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/kdc.yml
 
 krb5:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l krb5 \
+		--limit 'krb5' \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/krb5.yml
 
diff --git a/scripts/ktls.Makefile b/scripts/ktls.Makefile
index ee1de731329f47fec26e270acbd215c1aefa6629..83a8dbe6c88df4ce1161bfa827bf86ddb577de71 100644
--- a/scripts/ktls.Makefile
+++ b/scripts/ktls.Makefile
@@ -2,7 +2,6 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_KTLS))
 
 ktls:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ktls.yml
 
diff --git a/scripts/nfsd.Makefile b/scripts/nfsd.Makefile
index 79b980123591094c18a967e013c543166e886e4b..9779ec56b06d3cc6b1164f0dca0f1b0795169e7d 100644
--- a/scripts/nfsd.Makefile
+++ b/scripts/nfsd.Makefile
@@ -29,7 +29,7 @@ ANSIBLE_EXTRA_ARGS += $(NFSD_EXTRA_ARGS)
 
 nfsd:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l nfsd \
+		--limit 'nfsd' \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/nfsd.yml
 
diff --git a/scripts/provision.Makefile b/scripts/provision.Makefile
index 92a7541089fcea5ae7471a6b49584ab3a3ee4e78..4df632f82f5ea6de0c2b5775c66ec6423a813b89 100644
--- a/scripts/provision.Makefile
+++ b/scripts/provision.Makefile
@@ -69,8 +69,9 @@ KDEVOPS_MRPROPER += $(KDEVOPS_PROVISIONED_DEVCONFIG)
 
 $(KDEVOPS_PROVISIONED_DEVCONFIG):
 	$(Q)if [[ "$(CONFIG_KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK)" != "" ]]; then \
-		ansible-playbook $(ANSIBLE_VERBOSE) -i \
-			$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ;\
+		ansible-playbook $(ANSIBLE_VERBOSE) \
+			--limit '!localhost' \
+			$(KDEVOPS_PLAYBOOKS_DIR)/$(KDEVOPS_ANSIBLE_PROVISION_PLAYBOOK) ;\
 	fi
 	$(Q)touch $(KDEVOPS_PROVISIONED_DEVCONFIG)
 
diff --git a/scripts/rdma.Makefile b/scripts/rdma.Makefile
index 5c8b60d72f25e5e8a88f1301e1efccb2f2c58a99..c63b63a7c9395d458745a63ba699cf5294875f96 100644
--- a/scripts/rdma.Makefile
+++ b/scripts/rdma.Makefile
@@ -2,7 +2,6 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_SIW))
 
 siw:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/siw.yml
 
@@ -16,7 +15,6 @@ ifeq (y,$(CONFIG_KDEVOPS_SETUP_RDMA_RXE))
 
 rxe:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/rxe.yml
 
diff --git a/scripts/smbd.Makefile b/scripts/smbd.Makefile
index 1be5b93411a5629122de19f4470fbd0d9230a2bf..ba696f7366eb1971aacb5064bd66504041a05756 100644
--- a/scripts/smbd.Makefile
+++ b/scripts/smbd.Makefile
@@ -9,7 +9,7 @@ ANSIBLE_EXTRA_ARGS += $(SMBD_EXTRA_ARGS)
 
 smbd:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l smbd \
+		--limit 'smbd' \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/smbd.yml
 
diff --git a/scripts/systemd-timesync.Makefile b/scripts/systemd-timesync.Makefile
index 9b84b4a1135961ee6feaa22f4c760b2009fd4a6e..148bf1737db42bce077bab215de5c99722ebbd77 100644
--- a/scripts/systemd-timesync.Makefile
+++ b/scripts/systemd-timesync.Makefile
@@ -20,14 +20,14 @@ ANSIBLE_EXTRA_ARGS += devconfig_enable_systemd_timesyncd_ntp_google_debian='True
 endif
 
 timesyncd-client:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts --extra-vars '{ kdevops_cli_install: True }' \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		--extra-vars '{ kdevops_cli_install: True }' \
 		--tags vars_simple,timesyncd \
 		$(KDEVOPS_PLAYBOOKS_DIR)/devconfig.yml
 
 timesyncd-server:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/install_systemd_timesyncd.yml
 
 timesyncd-status:
diff --git a/scripts/terraform.Makefile b/scripts/terraform.Makefile
index 91469469188a4f38b5e4d3c44f8fed449df90881..1032fa638931d45eb91a9861823486395f3ca10c 100644
--- a/scripts/terraform.Makefile
+++ b/scripts/terraform.Makefile
@@ -102,13 +102,11 @@ ANSIBLE_EXTRA_ARGS += $(TERRAFORM_EXTRA_VARS)
 
 bringup_terraform:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		--connection=local --inventory localhost, \
 		playbooks/terraform.yml --tags bringup \
 		--extra-vars=@./extra_vars.yaml
 
 $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) \
 		playbooks/terraform.yml --tags ssh \
 		--extra-vars=@./extra_vars.yaml
 	$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
@@ -118,13 +116,11 @@ status_terraform:
 
 destroy_terraform:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		--connection=local -i $(KDEVOPS_HOSTFILE) \
 		playbooks/terraform.yml --tags destroy \
 		--extra-vars=@./extra_vars.yaml
 	$(Q)rm -f $(KDEVOPS_PROVISIONED_SSH) $(KDEVOPS_PROVISIONED_DEVCONFIG)
 
 $(KDEVOPS_TFVARS): $(KDEVOPS_TFVARS_TEMPLATE) .config
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gen_tfvars.yml \
 		--extra-vars=@./extra_vars.yaml
diff --git a/scripts/update_etc_hosts.Makefile b/scripts/update_etc_hosts.Makefile
index 4da15ea528374924b950824999fd6d70b4fd5aba..5fb90e987a32d5ae0449e09a2af5a5854b8a2ba5 100644
--- a/scripts/update_etc_hosts.Makefile
+++ b/scripts/update_etc_hosts.Makefile
@@ -1,6 +1,6 @@
 update_etc_hosts:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/update_etc_hosts.yml
+		playbooks/update_etc_hosts.yml
 
 KDEVOPS_BRING_UP_DEPS_EARLY += update_etc_hosts
 
diff --git a/scripts/vagrant.Makefile b/scripts/vagrant.Makefile
index e43a21d3c056225a0af5c3494cf64e75b648cd56..2c97f466a26127362971da6da0942fbff62a9b8c 100644
--- a/scripts/vagrant.Makefile
+++ b/scripts/vagrant.Makefile
@@ -80,21 +80,19 @@ extend-extra-args-vagrant:
 	fi
 
 vagrant_private_box_install:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		$(KDEVOPS_PLAYBOOKS_DIR)/install_vagrant_boxes.yml
 
 vagrant_9p_linux_clone:
 	$(Q)make linux-clone
 
 libvirt_pcie_passthrough_permissions:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/libvirt_pcie_passthrough.yml
 
 $(KDEVOPS_PROVISIONED_SSH):
 	$(Q)if [[ "$(CONFIG_KDEVOPS_SSH_CONFIG_UPDATE)" == "y" ]]; then \
-		ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-			--inventory localhost, \
+		ansible-playbook $(ANSIBLE_VERBOSE) \
 			playbooks/update_ssh_config_vagrant.yml
 	fi
 	$(Q)touch $(KDEVOPS_PROVISIONED_SSH)
diff --git a/scripts/workflows/lib/crash.py b/scripts/workflows/lib/crash.py
index 663de9324e87e3103bd9532e9ea6c44e6352d87a..72f506f612ab0897dede07d087426c3e295eba3a 100755
--- a/scripts/workflows/lib/crash.py
+++ b/scripts/workflows/lib/crash.py
@@ -769,9 +769,7 @@ class KernelCrashWatchdog:
             subprocess.run(
                 [
                     "ansible",
-                    "-i",
-                    "hosts",
-                    "all",
+                    "'all:!localhost'",
                     "-m",
                     "wait_for_connection",
                     "-l",
diff --git a/workflows/blktests/Makefile b/workflows/blktests/Makefile
index 33fb6482e2fa70f992893c3a076313992e19ce4f..92c96babccf05508732a976ab93e43a493ed9ba3 100644
--- a/workflows/blktests/Makefile
+++ b/workflows/blktests/Makefile
@@ -67,12 +67,13 @@ extend-extra-args-blktests:
 
 blktests:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/blktests.yml \
+		playbooks/blktests.yml \
 		--skip-tags run_tests,copy_results $(LIMIT_HOSTS)
 
 blktests-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/blktests.yml \
+		--limit 'baseline' \
+		playbooks/blktests.yml \
 		--tags run_tests,copy_results \
 		--extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
@@ -85,14 +86,16 @@ blktests-baseline-kernelci:
 
 blktests-baseline-skip-kdevops-update:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/blktests.yml \
+		--limit 'baseline' \
+		playbooks/blktests.yml \
 		--tags run_tests,copy_results --skip-tags git_update \
 		--extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
 
 blktests-baseline-run-oscheck-only:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/blktests.yml \
+		--limit 'baseline' \
+		playbooks/blktests.yml \
 		--tags run_tests,copy_results \
 		--skip-tags git_update,reboot,clean_results \
 		--extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
@@ -100,14 +103,16 @@ blktests-baseline-run-oscheck-only:
 
 blktests-dev:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/blktests.yml \
+		--limit 'dev' \
+		playbooks/blktests.yml \
 		--tags run_tests,copy_results \
 		--extra-vars '{ $(BLKTESTS_DYNAMIC_RUNTIME_VARS) }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
 
 blktests-baseline-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/blktests.yml \
+		--limit 'baseline' \
+		playbooks/blktests.yml \
 		--tags copy_results,print_results \
 		--extra-vars '{ kdevops_run_blktests: True }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
@@ -116,7 +121,8 @@ blktests-results: blktests-baseline-results
 
 blktests-dev-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/blktests.yml \
+		--limit 'dev' \
+		playbooks/blktests.yml \
 		--tags copy_results,print_results \
 		--extra-vars '{ kdevops_run_blktests: True }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
diff --git a/workflows/common/Makefile b/workflows/common/Makefile
index cfbebebd8ce2ced1147d7f9f4982bcdcbce89118..9ae0a0a9aff51276bedcbc3682841d7f7de04168 100644
--- a/workflows/common/Makefile
+++ b/workflows/common/Makefile
@@ -38,7 +38,7 @@ endif # CONFIG_WORKFLOW_INFER_USER_AND_GROUP == y
 ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_GIT_CLONES_KDEVOPS_GIT))
 kdevops-git-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/common.yml --tags vars,kdevops_reset \
+		playbooks/common.yml --tags vars,kdevops_reset \
 		--extra-vars '{ kdevops_git_reset: True }' $(LIMIT_HOSTS)
 
 kdevops-help-menu:
diff --git a/workflows/cxl/Makefile b/workflows/cxl/Makefile
index 11d3e8582b43a7fd13ce07ca626799fffe5168cd..bb13005763f81327a3fa71df2367b8e9418e7428 100644
--- a/workflows/cxl/Makefile
+++ b/workflows/cxl/Makefile
@@ -20,42 +20,42 @@ include $(TOPDIR)/workflows/cxl/Makefile.kernel
 
 cxl:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--skip-tags run_tests,copy_results \
 		$(LIMIT_HOSTS)
 
 cxl-test-probe:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,cxl-test-prep,cxl-test-probe \
 		--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
 		$(LIMIT_HOSTS)
 
 cxl-test-meson:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,cxl-test-prep,cxl-test-meson \
 		--extra-vars '{ $(CXL_DYNAMIC_RUNTIME_VARS) }' \
 		$(LIMIT_HOSTS)
 
 cxl-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,copy_results $(LIMIT_HOSTS)
 
 cxl-mem-setup:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,extra-vars,cxl-mem-setup $(LIMIT_HOSTS)
 
 cxl-create-dc-region:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,cxl-create-dc-region $(LIMIT_HOSTS)
 
 cxl-dcd-setup:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/cxl.yml \
+		playbooks/cxl.yml \
 		--tags vars,cxl-dcd-setup $(LIMIT_HOSTS)
 
 cxl-help-menu:
diff --git a/workflows/demos/reboot-limit/Makefile b/workflows/demos/reboot-limit/Makefile
index a6b4aaf788bd2e8fb30922a58c26f2bbe9a69a1e..e4cbf2947164dadc2c7bf4587f4afc6c8c46fdc5 100644
--- a/workflows/demos/reboot-limit/Makefile
+++ b/workflows/demos/reboot-limit/Makefile
@@ -25,7 +25,7 @@ REBOOT_LIMIT_TEST_TYPE :=$(subst ",,$(CONFIG_REBOOT_LIMIT_TEST_TYPE))
 # into the file extra_vars.yaml. The extra_vars.yaml file is always used as an
 # argument to ansible so that it reads our manually converted kconfig varibles
 # in ansible. We typically call a playbook with something like:
-# ansible-playbook -i hosts -l baseline playbooks/foo.yml --tags bar --extra-vars=@./extra_vars.yaml
+# ansible-playbook -l baseline playbooks/foo.yml --tags bar --extra-vars=@./extra_vars.yaml
 #
 # Likewise most playbooks also have something like the following as their first
 # task in their playbooks, so that they don't have to be specifying the
@@ -104,7 +104,7 @@ endif # CONFIG_KERNEL_CI
 # with tags "run_tests" or "copy_results".
 reboot-limit:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/reboot-limit.yml \
+		playbooks/reboot-limit.yml \
 		--skip-tags run_tests,copy_results
 
 # kdevops supports generic workflows such as the enabling you to then use the
@@ -134,10 +134,13 @@ reboot-limit:
 # fly.
 reboot-limit-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/reboot-limit.yml \
-		--tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+		--limit 'baseline' \
+		playbooks/reboot-limit.yml \
+		--tags vars,first_run,reset \
+		--extra-vars=@./extra_vars.yaml
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/reboot-limit.yml \
+		--limit 'baseline' \
+		playbooks/reboot-limit.yml \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml
 
@@ -155,16 +158,21 @@ reboot-limit-baseline-kernelci:
 # Resets the boot counters so we start from scratch
 reboot-limit-baseline-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/reboot-limit.yml \
-		--tags vars,reset --extra-vars=@./extra_vars.yaml
+		--limit 'baseline' \
+		playbooks/reboot-limit.yml \
+		--tags vars,reset \
+		--extra-vars=@./extra_vars.yaml
 
 # Below are the corresponding dev targets
 reboot-limit-dev-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/reboot-limit.yml \
-		--tags vars,first_run,reset --extra-vars=@./extra_vars.yaml
+		--limit 'dev' \
+		playbooks/reboot-limit.yml \
+		--tags vars,first_run,reset \
+		--extra-vars=@./extra_vars.yaml
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/reboot-limit.yml \
+		--limit 'dev' \
+		playbooks/reboot-limit.yml \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml
 
@@ -176,7 +184,9 @@ reboot-limit-dev-kernelci:
 
 reboot-limit-dev-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/reboot-limit.yml --tags vars,reset \
+		--limit 'dev' \
+		playbooks/reboot-limit.yml \
+		--tags vars,reset \
 		--extra-vars=@./extra_vars.yaml
 
 reboot-limit-help-menu:
diff --git a/workflows/fstests/Makefile b/workflows/fstests/Makefile
index a5e307b61b395a5a836d69bd9fea98d5cd49491c..48790d99c1dd6790d87accc56547853bb58a41b7 100644
--- a/workflows/fstests/Makefile
+++ b/workflows/fstests/Makefile
@@ -138,19 +138,22 @@ endif
 endif
 
 fstests: $(FSTESTS_BASELINE_EXTRA)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l localhost,baseline,dev \
-		-i hosts playbooks/fstests.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'localhost:baseline:dev' \
+		playbooks/fstests.yml \
 		--skip-tags run_tests,copy_results $(LIMIT_HOSTS)
 
 fstests-kdevops-setup: $(KDEVOPS_EXTRA_VARS) $(FSTESTS_BASELINE_EXTRA)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -l baseline,dev \
-		-i hosts playbooks/fstests.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'baseline:dev' \
+		playbooks/fstests.yml \
 		--tags vars,kdevops_fstests_setup,gendisks \
 		$(LIMIT_HOSTS)
 
 fstests-baseline: $(FSTESTS_BASELINE_EXTRA)
 	$(Q)PYTHONUNBUFFERED=1 ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags vars,run_tests,copy_results \
 		--extra-vars '{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
 		--extra-vars=@./extra_vars.yaml $(LIMIT_HOSTS)
@@ -163,7 +166,8 @@ fstests-baseline-kernelci: $(KDEVOPS_EXTRA_VARS)
 
 fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags run_tests,copy_results \
 		--skip-tags git_update \
 		--extra-vars \
@@ -173,7 +177,8 @@ fstests-baseline-skip-kdevops-update: $(KDEVOPS_EXTRA_VARS)
 
 fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags run_tests,copy_results \
 		--skip-tags git_update,reboot,clean_results \
 		--extra-vars \
@@ -183,14 +188,14 @@ fstests-baseline-run-oscheck-only: $(KDEVOPS_EXTRA_VARS)
 
 fstests-config: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags vars,generate-fstests-config \
 		--extra-vars=@./extra_vars.yaml \
 		$(LIMIT_HOSTS)
 
 fstests-config-debug: $(KDEVOPS_EXTRA_VARS)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
 		playbooks/fstests.yml \
 		-e 'fstests_debug_localhost=True' \
 		--tags vars,generate-fstests-config \
@@ -198,7 +203,8 @@ fstests-config-debug: $(KDEVOPS_EXTRA_VARS)
 
 fstests-dev: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/fstests.yml \
+		--limit 'dev' \
+		playbooks/fstests.yml \
 		--tags vars,run_tests,copy_results \
 		--extra-vars \
 		'{ $(FSTESTS_DYNAMIC_RUNTIME_VARS) }' \
@@ -206,7 +212,8 @@ fstests-dev: $(KDEVOPS_EXTRA_VARS)
 
 fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags vars,tfb \
 		--skip-tags copy_final \
 		--extra-vars \
@@ -215,7 +222,8 @@ fstests-baseline-results-tfb-ls: $(KDEVOPS_EXTRA_VARS)
 
 fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags vars,tfb \
 		--skip-tags copy_final \
 		--extra-vars \
@@ -224,7 +232,8 @@ fstests-baseline-results-tfb-trim: $(KDEVOPS_EXTRA_VARS)
 
 fstests-baseline-results: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/fstests.yml \
+		--limit 'baseline' \
+		playbooks/fstests.yml \
 		--tags copy_results,print_results,tfb \
 		--extra-vars '{ kdevops_run_fstests: True }' \
 		--extra-vars=@./extra_vars.yaml \
@@ -234,7 +243,8 @@ fstests-results: fstests-baseline-results
 
 fstests-dev-results: $(KDEVOPS_EXTRA_VARS)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l dev playbooks/fstests.yml \
+		--limit 'dev' \
+		playbooks/fstests.yml \
 		--tags copy_results,print_results \
 		--extra-vars '{ kdevops_run_fstests: True }' \
 		--extra-vars=@./extra_vars.yaml \
diff --git a/workflows/gitr/Makefile b/workflows/gitr/Makefile
index b8a1b3a439911247c0b0289321e64873efb5bc83..09ef466f70b955fd3032f8f836ba1ce4854f8513 100644
--- a/workflows/gitr/Makefile
+++ b/workflows/gitr/Makefile
@@ -90,13 +90,13 @@ endif
 
 gitr:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+		--limit 'baseline:dev' \
 		--skip-tags run_tests,run_specific_tests,copy_results \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
 
 gitr-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline \
+		--limit 'baseline' \
 		--tags $(GITR_PLAY_TAGS) \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
@@ -109,7 +109,7 @@ gitr-baseline-kernelci:
 
 gitr-dev-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags $(GITR_PLAY_TAGS) \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
@@ -122,7 +122,7 @@ gitr-dev-kernelci:
 
 gitr-dev-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/gitr.yml
diff --git a/workflows/linux/Makefile b/workflows/linux/Makefile
index 4d208e3e2de3d40e87df1e4d06a46723d05fb4da..199161fa29a503cec9593182d849422e73158597 100644
--- a/workflows/linux/Makefile
+++ b/workflows/linux/Makefile
@@ -75,6 +75,7 @@ linux-help-menu:
 		echo "linux-mount        - Mounts 9p path on targets" ;\
 	fi
 	@echo "linux-deploy       - Builds, installs, updates GRUB and reboots - useful for rapid development"
+	@echo "linux-build        - Builds kernel"
 	@echo "linux-install      - Only builds and installs Linux"
 	@echo "linux-uninstall    - Remove a kernel you can pass arguments for the version such as KVER=6.5.0-rc7-next-20230825"
 	@echo "linux-clone        - Only clones Linux"
@@ -91,51 +92,66 @@ LINUX_HELP_EXTRA :=
 PHONY += linux
 linux: $(KDEVOPS_NODES)
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
 		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux-local.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)"
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
 
 PHONY += linux-mount
 linux-mount:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--tags vars,9p_mount \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
 
 PHONY += linux-deploy
 linux-deploy:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--tags vars,build-linux,install-linux,manual-update-grub,saved,vars,reboot \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
 
+PHONY += linux-build
+linux-build:
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+		--tags vars,build-linux,saved,vars \
+		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
+
 PHONY += linux-install
 linux-install:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--tags vars,build-linux,install-linux \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
 
 PHONY += linux-uninstall
 linux-uninstall:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--tags uninstall-linux,vars \
 		--extra-vars '{ "uninstall_kernel_enable": "True", $(LINUX_DYNAMIC_RUNTIME_VARS) }' \
 		$(LIMIT_HOSTS)
 
 linux-clone-clients: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) \
 		--tags vars,deps,clone
 
 PHONY += linux-clone-9p
 linux-clone-9p: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) --connection=local \
-		--inventory localhost, \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'localhost' \
 		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" \
 		--tags vars,deps,clone
@@ -145,27 +161,30 @@ linux-clone: $(KDEVOPS_NODES) $(LINUX_CLONE_DEFAULT_TYPE)
 
 PHONY += linux-grub-setup
 linux-grub-setup:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags manual-update-grub,saved,vars
 
 PHONY += linux-reboot
 linux-reboot:
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS) --tags vars,reboot
 
 PHONY += uname
 uname:
-	$(Q)ansible 'all:!localhost' -i hosts -b -m command -a "uname -r" -o \
+	$(Q)ansible 'all:!localhost' -b -m command -a "uname -r" -o \
 	| awk -F '|' '{gsub(/^ +| +$$/, "", $$2); printf "%-30s %s\n", $$1, $$4}' \
 	| sed -e 's|(stdout)||'
 
 ifeq (y,$(CONFIG_KDEVOPS_WORKFLOW_ENABLE_CXL))
 PHONY += linux-cxl
 linux-cxl: $(KDEVOPS_NODES)
-	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) -i \
-		$(KDEVOPS_HOSTFILE) $(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
+	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
+		--limit 'all:!localhost' \
+		$(KDEVOPS_PLAYBOOKS_DIR)/bootlinux.yml \
 		--tags 'vars,cxl-build,cxl-install'                             \
 		--extra-vars="$(BOOTLINUX_ARGS)" $(LIMIT_HOSTS)
 
diff --git a/workflows/ltp/Makefile b/workflows/ltp/Makefile
index 081e8364d7f7dbf0cb713285ec869d9f1977f539..ddbdf7399789ffae037dabd4ec8f49e696cff18b 100644
--- a/workflows/ltp/Makefile
+++ b/workflows/ltp/Makefile
@@ -116,13 +116,13 @@ endif
 
 ltp:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+		--limit 'baseline:dev' \
 		--skip-tags run_tests,copy_results \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
 
 ltp-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline \
+		--limit 'baseline' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
@@ -135,7 +135,7 @@ ltp-baseline-kernelci:
 
 ltp-dev-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
@@ -148,7 +148,7 @@ ltp-dev-kernelci:
 
 ltp-dev-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/ltp.yml
diff --git a/workflows/nfstest/Makefile b/workflows/nfstest/Makefile
index 80c00c12c20520953e0c0a11d2f324512fb51190..3945edf66d83dcc422337c3f6c693ddd04500251 100644
--- a/workflows/nfstest/Makefile
+++ b/workflows/nfstest/Makefile
@@ -73,13 +73,13 @@ endif
 
 nfstest:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+		--limit 'baseline:dev' \
 		--skip-tags run_tests,copy_results \
 		$(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
 
 nfstest-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline \
+		--limit 'baseline' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
@@ -92,7 +92,7 @@ nfstest-baseline-kernelci:
 
 nfstest-dev-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
@@ -105,7 +105,7 @@ nfstest-dev-kernelci:
 
 nfstest-dev-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/nfstest.yml
diff --git a/workflows/pynfs/Makefile b/workflows/pynfs/Makefile
index dc4b29c52ccf6455e52a6de8f1f12de81bc484a2..1dfd349c868c3fd58565ac8a8f9eb86aabc1b588 100644
--- a/workflows/pynfs/Makefile
+++ b/workflows/pynfs/Makefile
@@ -45,18 +45,18 @@ endif
 # Makefile for pynfs targets
 pynfs:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline,dev \
+		--limit 'baseline:dev' \
 		--skip-tags run_tests,copy_results,clean_local_results \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
 
 pynfs-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline \
+		--limit 'baseline' \
 		--tags vars,first_run,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l baseline \
+		--limit 'baseline' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
@@ -75,12 +75,12 @@ pynfs-baseline-kernelci:
 # Below are the corresponding dev targets
 pynfs-dev-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,first_run,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,run_tests,copy_results \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
@@ -93,7 +93,7 @@ pynfs-dev-kernelci:
 
 pynfs-dev-reset:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i $(KDEVOPS_HOSTFILE) -l dev \
+		--limit 'dev' \
 		--tags vars,reset \
 		--extra-vars=@./extra_vars.yaml \
 		$(KDEVOPS_PLAYBOOKS_DIR)/pynfs.yml
diff --git a/workflows/selftests/Makefile b/workflows/selftests/Makefile
index 075da61b0c26829ab4732d640da736cc958ee394..d3b7044c4ec7bf2468e36b5a1242ff1831356041 100644
--- a/workflows/selftests/Makefile
+++ b/workflows/selftests/Makefile
@@ -33,24 +33,27 @@ include $(TOPDIR)/workflows/selftests/tests/Makefile.xarray
 
 selftests:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/selftests.yml \
+		playbooks/selftests.yml \
 		--skip-tags run_tests,copy_results,check_results \
 		$(LIMIT_HOSTS)
 
 selftests-baseline:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/selftests.yml \
+		--limit 'baseline' \
+		playbooks/selftests.yml \
 		--extra-vars '{ $(SELFTESTS_DYNAMIC_RUNTIME_VARS) }' \
 		--tags vars,run_tests,copy_results,check_results $(LIMIT_HOSTS)
 
 selftests-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/selftests.yml \
+		--limit 'baseline' \
+		playbooks/selftests.yml \
 		--tags vars,copy_results,check_results $(LIMIT_HOSTS)
 
 selftests-check-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts -l baseline playbooks/selftests.yml \
+		--limit 'baseline' \
+		playbooks/selftests.yml \
 		--tags vars,check_results $(LIMIT_HOSTS)
 
 selftests-help-main:
diff --git a/workflows/sysbench/Makefile b/workflows/sysbench/Makefile
index 21cb297e722c6190ecd2b8ced96d7fa675a38214..daf7bc75da2b7b164ca8a2bd891a41d097b8669b 100644
--- a/workflows/sysbench/Makefile
+++ b/workflows/sysbench/Makefile
@@ -29,36 +29,36 @@ TAGS_SYSBENCH_RESULTS += results
 # Target to set up sysbench (MySQL or PostgreSQL)
 sysbench:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--skip-tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_RUN))
 
 # Target to run sysbench tests (including telemetry)
 sysbench-test:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_TEST))
 
 # Optional target to collect telemetry
 sysbench-telemetry:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_TELEMETRY))
 
 # Optional target to collect all results
 sysbench-results:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--tags $(subst $(space),$(comma),$(TAGS_SYSBENCH_RESULTS))
 
 sysbench-clean:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--tags vars,clean
 
 # Optional in case you want to improve graphing
 sysbench-plot:
 	$(Q)ansible-playbook $(ANSIBLE_VERBOSE) \
-		-i hosts playbooks/sysbench.yml \
+		playbooks/sysbench.yml \
 		--tags vars,plot
 
 # Help target to show available options

-- 
2.49.0