diff --git a/.github/workflows/jenkins-driver-tests.yml b/.github/workflows/jenkins-driver-tests.yml
index 1e29ea8afc..39c40bdf1e 100644
--- a/.github/workflows/jenkins-driver-tests.yml
+++ b/.github/workflows/jenkins-driver-tests.yml
@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix:
         version:
-          [ 59, 60 ]
+          [ 59, 60, dev]
 
     runs-on: ubuntu-latest
     steps:
diff --git a/drivers/SmartThings/zwave-button/src/apiv6_bugfix/can_handle.lua b/drivers/SmartThings/zwave-button/src/apiv6_bugfix/can_handle.lua
new file mode 100644
index 0000000000..749810f01f
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/apiv6_bugfix/can_handle.lua
@@ -0,0 +1,18 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle(opts, driver, device, cmd, ...)
+  local cc = require "st.zwave.CommandClass"
+  local WakeUp = (require "st.zwave.CommandClass.WakeUp")({ version = 1 })
+  local version = require "version"
+  if version.api == 6 and
+    cmd.cmd_class == cc.WAKE_UP and
+    cmd.cmd_id == WakeUp.NOTIFICATION then
+      return true, require("apiv6_bugfix")
+  end
+  return false
+end
+
+-- Random comment to force a change for testing purposes 3
+
+return can_handle
diff --git a/drivers/SmartThings/zwave-button/src/apiv6_bugfix/init.lua b/drivers/SmartThings/zwave-button/src/apiv6_bugfix/init.lua
index 0204b7b2d5..2e7e3ca3b8 100644
--- a/drivers/SmartThings/zwave-button/src/apiv6_bugfix/init.lua
+++ b/drivers/SmartThings/zwave-button/src/apiv6_bugfix/init.lua
@@ -1,13 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 local cc = require "st.zwave.CommandClass"
 local WakeUp = (require "st.zwave.CommandClass.WakeUp")({ version = 1 })
 
 
-local function can_handle(opts, driver, device, cmd, ...)
-  local version = require "version"
-  return version.api == 6 and
-    cmd.cmd_class == cc.WAKE_UP and
-    cmd.cmd_id == WakeUp.NOTIFICATION
-end
 
 local function wakeup_notification(driver, device, cmd)
   device:refresh()
@@ -20,7 +17,7 @@ local apiv6_bugfix = {
     }
   },
   NAME = "apiv6_bugfix",
-  can_handle = can_handle
+  can_handle = require("apiv6_bugfix.can_handle"),
 }
 
 return apiv6_bugfix
diff --git a/drivers/SmartThings/zwave-button/src/configurations.lua b/drivers/SmartThings/zwave-button/src/configurations.lua
index 5dc1b96e0f..2c93b5075c 100644
--- a/drivers/SmartThings/zwave-button/src/configurations.lua
+++ b/drivers/SmartThings/zwave-button/src/configurations.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local devices = {
   AEOTEC_NANOMOTE_ONE = {
diff --git a/drivers/SmartThings/zwave-button/src/init.lua b/drivers/SmartThings/zwave-button/src/init.lua
index b369197a5b..73672f3bcb 100644
--- a/drivers/SmartThings/zwave-button/src/init.lua
+++ b/drivers/SmartThings/zwave-button/src/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.defaults
@@ -41,10 +31,7 @@ local driver_template = {
   lifecycle_handlers = {
     added = added_handler,
   },
-  sub_drivers = {
-    require("zwave-multi-button"),
-    require("apiv6_bugfix"),
-  }
+  sub_drivers = require("sub_drivers"),
 }
 
 defaults.register_for_default_handlers(driver_template, driver_template.supported_capabilities)
diff --git a/drivers/SmartThings/zwave-button/src/lazy_load_subdriver.lua b/drivers/SmartThings/zwave-button/src/lazy_load_subdriver.lua
new file mode 100644
index 0000000000..45115081e4
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/lazy_load_subdriver.lua
@@ -0,0 +1,18 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
+return function(sub_driver_name)
+  -- gets the current lua libs api version
+  local ZwaveDriver = require "st.zwave.driver"
+  local version = require "version"
+
+  if version.api >= 16 then
+    return ZwaveDriver.lazy_load_sub_driver_v2(sub_driver_name)
+  elseif version.api >= 9 then
+    return ZwaveDriver.lazy_load_sub_driver(require(sub_driver_name))
+  else
+    return require(sub_driver_name)
+  end
+
+end
diff --git a/drivers/SmartThings/zwave-button/src/sub_drivers.lua b/drivers/SmartThings/zwave-button/src/sub_drivers.lua
new file mode 100644
index 0000000000..57e87ad8ad
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/sub_drivers.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local lazy_load_if_possible = require "lazy_load_subdriver"
+local sub_drivers = {
+   lazy_load_if_possible("zwave-multi-button"),
+   lazy_load_if_possible("apiv6_bugfix"),
+}
+return sub_drivers
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_minimote.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_minimote.lua
index 6876b7026f..88bf890686 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_minimote.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_minimote.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
index 4d8be4dad2..7df9c6cada 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_aeotec_nanomote_one.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
index f5e16ba158..664d048010 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_button.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
index e03471594f..5418917ee5 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_fibaro_button.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua b/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
index 07132534c5..b88a85a800 100644
--- a/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
+++ b/drivers/SmartThings/zwave-button/src/test/test_zwave_multi_button.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/can_handle.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/can_handle.lua
new file mode 100644
index 0000000000..5a2fec217c
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_aeotec_keyfob(opts, driver, device, ...)
+  local FINGERPRINTS = require("zwave-multi-button.aeotec-keyfob.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("zwave-multi-button.aeotec-keyfob")
+    end
+  end
+  return false
+end
+
+return can_handle_aeotec_keyfob
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/fingerprints.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/fingerprints.lua
new file mode 100644
index 0000000000..dd6a9c8219
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/fingerprints.lua
@@ -0,0 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZWAVE_AEOTEC_KEYFOB_FINGERPRINTS = {
+  {mfr = 0x0086, prod = 0x0101, model = 0x0058}, -- Aeotec KeyFob US
+  {mfr = 0x0086, prod = 0x0001, model = 0x0058}, -- Aeotec KeyFob EU
+  {mfr = 0x0086, prod = 0x0001, model = 0x0026} -- Aeotec Panic Button
+}
+
+return ZWAVE_AEOTEC_KEYFOB_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/init.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/init.lua
index c8b655bff2..ad3f69c41b 100644
--- a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/init.lua
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-keyfob/init.lua
@@ -1,37 +1,11 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
 
 --- @type st.zwave.CommandClass.Configuration
 local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 })
 --- @type st.zwave.CommandClass.Association
 local Association = (require "st.zwave.CommandClass.Association")({ version=1 })
 
-local ZWAVE_AEOTEC_KEYFOB_FINGERPRINTS = {
-  {mfr = 0x0086, prod = 0x0101, model = 0x0058}, -- Aeotec KeyFob US
-  {mfr = 0x0086, prod = 0x0001, model = 0x0058}, -- Aeotec KeyFob EU
-  {mfr = 0x0086, prod = 0x0001, model = 0x0026} -- Aeotec Panic Button
-}
-
-local function can_handle_aeotec_keyfob(opts, driver, device, ...)
-  for _, fingerprint in ipairs(ZWAVE_AEOTEC_KEYFOB_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
-
 local do_configure = function(self, device)
   device:refresh()
   device:send(Configuration:Set({ configuration_value = 1, parameter_number = 250, size = 1 }))
@@ -43,7 +17,7 @@ local aeotec_keyfob = {
   lifecycle_handlers = {
     doConfigure = do_configure
   },
-  can_handle = can_handle_aeotec_keyfob,
+  can_handle = require("zwave-multi-button.aeotec-keyfob.can_handle"),
 }
 
 return aeotec_keyfob
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/can_handle.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/can_handle.lua
new file mode 100644
index 0000000000..fb39fa8f70
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_aeotec_minimote(opts, driver, device, ...)
+  local FINGERPRINTS = require("zwave-multi-button.aeotec-minimote.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("zwave-multi-button.aeotec-minimote")
+    end
+  end
+  return false
+end
+
+return can_handle_aeotec_minimote
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/fingerprints.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/fingerprints.lua
new file mode 100644
index 0000000000..b63e217394
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/fingerprints.lua
@@ -0,0 +1,8 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZWAVE_AEOTEC_MINIMOTE_FINGERPRINTS = {
+  {mfr = 0x0086, prod = 0x0001, model = 0x0003} -- Aeotec Mimimote
+}
+
+return ZWAVE_AEOTEC_MINIMOTE_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/init.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/init.lua
index 814bcb775b..05bba2cd8b 100644
--- a/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/init.lua
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/aeotec-minimote/init.lua
@@ -1,16 +1,6 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
@@ -20,18 +10,7 @@ local Basic = (require "st.zwave.CommandClass.Basic")({ version = 1 })
 --- @type st.zwave.CommandClass.Configuration
 local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 })
 
-local ZWAVE_AEOTEC_MINIMOTE_FINGERPRINTS = {
-  {mfr = 0x0086, prod = 0x0001, model = 0x0003} -- Aeotec Mimimote
-}
 
-local function can_handle_aeotec_minimote(opts, driver, device, ...)
-  for _, fingerprint in ipairs(ZWAVE_AEOTEC_MINIMOTE_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function basic_set_handler(self, device, cmd)
   local button = cmd.args.value // 40 + 1
@@ -59,7 +38,7 @@ local aeotec_minimote = {
   lifecycle_handlers = {
     doConfigure = do_configure
   },
-  can_handle = can_handle_aeotec_minimote,
+  can_handle = require("zwave-multi-button.aeotec-minimote.can_handle"),
 }
 
 return aeotec_minimote
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/can_handle.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/can_handle.lua
new file mode 100644
index 0000000000..a9d7d24be2
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_zwave_multi_button(opts, driver, device, ...)
+  local FINGERPRINTS = require("zwave-multi-button.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("zwave-multi-button")
+    end
+  end
+  return false
+end
+
+return can_handle_zwave_multi_button
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/can_handle.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/can_handle.lua
new file mode 100644
index 0000000000..055e4f1eff
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_fibaro_keyfob(opts, driver, device, ...)
+  local FINGERPRINTS = require("zwave-multi-button.fibaro-keyfob.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("zwave-multi-button.fibaro-keyfob")
+    end
+  end
+  return false
+end
+
+return can_handle_fibaro_keyfob
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/fingerprints.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/fingerprints.lua
new file mode 100644
index 0000000000..269d136689
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/fingerprints.lua
@@ -0,0 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZWAVE_FIBARO_KEYFOB_FINGERPRINTS = {
+  {mfr = 0x010F, prod = 0x1001, model = 0x1000}, -- Fibaro KeyFob EU
+  {mfr = 0x010F, prod = 0x1001, model = 0x2000}, -- Fibaro KeyFob US
+  {mfr = 0x010F, prod = 0x1001, model = 0x3000} -- Fibaro KeyFob AU
+}
+
+return ZWAVE_FIBARO_KEYFOB_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/init.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/init.lua
index 653cd21ddd..c4138fdcaa 100644
--- a/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/init.lua
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fibaro-keyfob/init.lua
@@ -1,34 +1,11 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 --- @type st.zwave.CommandClass.Configuration
 local Configuration = (require "st.zwave.CommandClass.Configuration")({ version = 4 })
 
-local ZWAVE_FIBARO_KEYFOB_FINGERPRINTS = {
-  {mfr = 0x010F, prod = 0x1001, model = 0x1000}, -- Fibaro KeyFob EU
-  {mfr = 0x010F, prod = 0x1001, model = 0x2000}, -- Fibaro KeyFob US
-  {mfr = 0x010F, prod = 0x1001, model = 0x3000} -- Fibaro KeyFob AU
-}
 
-local function can_handle_fibaro_keyfob(opts, driver, device, ...)
-  for _, fingerprint in ipairs(ZWAVE_FIBARO_KEYFOB_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local function do_configure(self, device)
   device:refresh()
@@ -46,7 +23,7 @@ local fibaro_keyfob = {
   lifecycle_handlers = {
     doConfigure = do_configure
   },
-  can_handle = can_handle_fibaro_keyfob,
+  can_handle = require("zwave-multi-button.fibaro-keyfob.can_handle"),
 }
 
 return fibaro_keyfob
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/fingerprints.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fingerprints.lua
new file mode 100644
index 0000000000..4e539c90ab
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/fingerprints.lua
@@ -0,0 +1,23 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local ZWAVE_MULTI_BUTTON_FINGERPRINTS = {
+  {mfr = 0x010F, prod = 0x1001, model = 0x1000}, -- Fibaro KeyFob EU
+  {mfr = 0x010F, prod = 0x1001, model = 0x2000}, -- Fibaro KeyFob US
+  {mfr = 0x010F, prod = 0x1001, model = 0x3000}, -- Fibaro KeyFob AU
+  {mfr = 0x0371, prod = 0x0002, model = 0x0003}, -- Aeotec NanoMote Quad EU
+  {mfr = 0x0371, prod = 0x0102, model = 0x0003}, -- Aeotec NanoMote Quad US
+  {mfr = 0x0086, prod = 0x0001, model = 0x0058}, -- Aeotec KeyFob EU
+  {mfr = 0x0086, prod = 0x0101, model = 0x0058}, -- Aeotec KeyFob US
+  {mfr = 0x0086, prod = 0x0002, model = 0x0082}, -- Aeotec Wallmote Quad EU
+  {mfr = 0x0086, prod = 0x0102, model = 0x0082}, -- Aeotec Wallmote Quad US
+  {mfr = 0x0086, prod = 0x0002, model = 0x0081}, -- Aeotec Wallmote EU
+  {mfr = 0x0086, prod = 0x0102, model = 0x0081}, -- Aeotec Wallmote US
+  {mfr = 0x0060, prod = 0x000A, model = 0x0003}, -- Everspring Remote Control
+  {mfr = 0x0086, prod = 0x0001, model = 0x0003}, -- Aeotec Mimimote,
+  {mfr = 0x0371, prod = 0x0102, model = 0x0016}, -- Aeotec illumino Wallmote 7,
+  {mfr = 0x0460, prod = 0x0009, model = 0x0081}, -- Shelly Wave i4,
+  {mfr = 0x0460, prod = 0x0009, model = 0x0082}  -- Shelly Wave i4DC,
+}
+
+return ZWAVE_MULTI_BUTTON_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/init.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/init.lua
index 9094dc4111..acad935ad4 100644
--- a/drivers/SmartThings/zwave-button/src/zwave-multi-button/init.lua
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/init.lua
@@ -1,16 +1,7 @@
--- Copyright 2022 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2022 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+
 
 local capabilities = require "st.capabilities"
 --- @type st.zwave.CommandClass
@@ -20,33 +11,7 @@ local CentralScene = (require "st.zwave.CommandClass.CentralScene")({ version=1
 --- @type st.zwave.CommandClass.SceneActivation
 local SceneActivation = (require "st.zwave.CommandClass.SceneActivation")({ version=1 })
 
-local ZWAVE_MULTI_BUTTON_FINGERPRINTS = {
-  {mfr = 0x010F, prod = 0x1001, model = 0x1000}, -- Fibaro KeyFob EU
-  {mfr = 0x010F, prod = 0x1001, model = 0x2000}, -- Fibaro KeyFob US
-  {mfr = 0x010F, prod = 0x1001, model = 0x3000}, -- Fibaro KeyFob AU
-  {mfr = 0x0371, prod = 0x0002, model = 0x0003}, -- Aeotec NanoMote Quad EU
-  {mfr = 0x0371, prod = 0x0102, model = 0x0003}, -- Aeotec NanoMote Quad US
-  {mfr = 0x0086, prod = 0x0001, model = 0x0058}, -- Aeotec KeyFob EU
-  {mfr = 0x0086, prod = 0x0101, model = 0x0058}, -- Aeotec KeyFob US
-  {mfr = 0x0086, prod = 0x0002, model = 0x0082}, -- Aeotec Wallmote Quad EU
-  {mfr = 0x0086, prod = 0x0102, model = 0x0082}, -- Aeotec Wallmote Quad US
-  {mfr = 0x0086, prod = 0x0002, model = 0x0081}, -- Aeotec Wallmote EU
-  {mfr = 0x0086, prod = 0x0102, model = 0x0081}, -- Aeotec Wallmote US
-  {mfr = 0x0060, prod = 0x000A, model = 0x0003}, -- Everspring Remote Control
-  {mfr = 0x0086, prod = 0x0001, model = 0x0003}, -- Aeotec Mimimote,
-  {mfr = 0x0371, prod = 0x0102, model = 0x0016}, -- Aeotec illumino Wallmote 7,
-  {mfr = 0x0460, prod = 0x0009, model = 0x0081}, -- Shelly Wave i4,
-  {mfr = 0x0460, prod = 0x0009, model = 0x0082}  -- Shelly Wave i4DC,
-}
 
-local function can_handle_zwave_multi_button(opts, driver, device, ...)
-  for _, fingerprint in ipairs(ZWAVE_MULTI_BUTTON_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local map_key_attribute_to_capability = {
   [CentralScene.key_attributes.KEY_PRESSED_1_TIME] = capabilities.button.button.pushed,
@@ -115,12 +80,8 @@ local zwave_multi_button = {
   lifecycle_handlers = {
     init = device_init
   },
-  can_handle = can_handle_zwave_multi_button,
-  sub_drivers = {
-    require("zwave-multi-button/aeotec-keyfob"),
-    require("zwave-multi-button/fibaro-keyfob"),
-    require("zwave-multi-button/aeotec-minimote")
-  }
+  can_handle = require("zwave-multi-button.can_handle"),
+  sub_drivers = require("zwave-multi-button.sub_drivers"),
 }
 
 return zwave_multi_button
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/can_handle.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/can_handle.lua
new file mode 100644
index 0000000000..8f61d8227b
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/can_handle.lua
@@ -0,0 +1,14 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local function can_handle_shelly_wave_i4(opts, driver, device, ...)
+  local FINGERPRINTS = require("zwave-multi-button.shelly_wave_i4.fingerprints")
+  for _, fingerprint in ipairs(FINGERPRINTS) do
+    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
+      return true, require("shelly_wave_i4")
+    end
+  end
+  return false
+end
+
+return can_handle_shelly_wave_i4
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/fingerprints.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/fingerprints.lua
new file mode 100644
index 0000000000..459a811d9a
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/fingerprints.lua
@@ -0,0 +1,9 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local SHELLY_WAVE_i4_FINGERPRINTS = {
+  {mfr = 0x0460, prod = 0x0009, model = 0x0081}, -- Shelly Wave i4
+  {mfr = 0x0460, prod = 0x0009, model = 0x0082}  -- Shelly Wave i4 DC
+}
+
+return SHELLY_WAVE_i4_FINGERPRINTS
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/init.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/init.lua
index 4e962cebb1..2034e05eb8 100644
--- a/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/init.lua
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/shelly_wave_i4/init.lua
@@ -1,35 +1,13 @@
--- Copyright 2025 SmartThings
---
--- Licensed under the Apache License, Version 2.0 (the "License");
--- you may not use this file except in compliance with the License.
--- You may obtain a copy of the License at
---
---     http://www.apache.org/licenses/LICENSE-2.0
---
--- Unless required by applicable law or agreed to in writing, software
--- distributed under the License is distributed on an "AS IS" BASIS,
--- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
--- See the License for the specific language governing permissions and
--- limitations under the License.
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
 
 -- @type st.zwave.CommandClass.Configuration
 local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 })
 -- @type st.zwave.CommandClass.Association
 local Association = (require "st.zwave.CommandClass.Association")({ version=2 })
 
-local SHELLY_WAVE_i4_FINGERPRINTS = {
-  {mfr = 0x0460, prod = 0x0009, model = 0x0081}, -- Shelly Wave i4
-  {mfr = 0x0460, prod = 0x0009, model = 0x0082}  -- Shelly Wave i4 DC
-}
 
-local function can_handle_shelly_wave_i4(opts, driver, device, ...)
-  for _, fingerprint in ipairs(SHELLY_WAVE_i4_FINGERPRINTS) do
-    if device:id_match(fingerprint.mfr, fingerprint.prod, fingerprint.model) then
-      return true
-    end
-  end
-  return false
-end
 
 local do_configure = function(self, device)
   device:refresh()
@@ -45,7 +23,7 @@ local shelly_wave_i4 = {
   lifecycle_handlers = {
     doConfigure = do_configure
   },
-  can_handle = can_handle_shelly_wave_i4,
+  can_handle = require("zwave-multi-button.shelly_wave_i4.can_handle"),
 }
 
 return shelly_wave_i4
diff --git a/drivers/SmartThings/zwave-button/src/zwave-multi-button/sub_drivers.lua b/drivers/SmartThings/zwave-button/src/zwave-multi-button/sub_drivers.lua
new file mode 100644
index 0000000000..01412a33e1
--- /dev/null
+++ b/drivers/SmartThings/zwave-button/src/zwave-multi-button/sub_drivers.lua
@@ -0,0 +1,10 @@
+-- Copyright 2025 SmartThings, Inc.
+-- Licensed under the Apache License, Version 2.0
+
+local lazy_load_if_possible = require "lazy_load_subdriver"
+local sub_drivers = {
+   lazy_load_if_possible("zwave-multi-button/aeotec-keyfob"),
+   lazy_load_if_possible("zwave-multi-button/fibaro-keyfob"),
+   lazy_load_if_possible("zwave-multi-button/aeotec-minimote"),
+}
+return sub_drivers