diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 82efb03..b1ecc80 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,12 +9,13 @@ jobs:
       fail-fast: false
       matrix:
         env:
-          - {ROS_DISTRO: humble, ROS_REPO: ros}
+          - {ROS_DISTRO: jazzy, ROS_REPO: ros}
           - {ROS_DISTRO: rolling, ROS_REPO: ros}
     env:
       PYLINT_ARGS: "--errors-only  --ignore-paths=^.*src/executive_smach/smach/smach/user_data.py$,^.*src/executive_smach/smach/smach/user_data.py$,^.*src/executive_smach/smach_ros/smach_ros/service_state.py$,^.*src/executive_smach/smach_ros/smach_ros/simple_action_state.py$,^.*src/executive_smach/smach_ros/test/.*$"
       PYLINT_CHECK: true
-    runs-on: ubuntu-22.04
+      PYTHONWARNINGS: "$PYTHONWARNINGS,ignore:setup.py install is deprecated::setuptools.command.install,ignore:easy_install command is deprecated::setuptools.command.easy_install"
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v2
       - uses: 'ros-industrial/industrial_ci@master'
diff --git a/smach/setup.cfg b/smach/setup.cfg
index 1b11c4d..6ad2624 100644
--- a/smach/setup.cfg
+++ b/smach/setup.cfg
@@ -1,4 +1,4 @@
 [develop]
-script-dir=$base/lib/smach
+script_dir=$base/lib/smach
 [install]
-install-scripts=$base/lib/smach
+install_scripts=$base/lib/smach
diff --git a/smach/setup.py b/smach/setup.py
index 5ec13f9..d81c9d0 100644
--- a/smach/setup.py
+++ b/smach/setup.py
@@ -13,12 +13,7 @@
     zip_safe=True,
     maintainer='Isaac I. Y. Saito',
     maintainer_email='gm130s@gmail.com',
-    description='''
-        SMACH is a task-level architecture for rapidly creating complex robot
-        behavior. At its core, SMACH is a ROS-independent Python library to build
-        hierarchical state machines. SMACH is a new library that takes advantage of
-        very old concepts in order to quickly create robust robot behavior with
-        maintainable and modular code.''',
+    description='''SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''',
     license='BSD',
     data_files=[
         ('share/ament_index/resource_index/packages',
diff --git a/smach/smach/state_machine.py b/smach/smach/state_machine.py
index 8c27a0f..75d091f 100644
--- a/smach/smach/state_machine.py
+++ b/smach/smach/state_machine.py
@@ -74,7 +74,7 @@ def __init__(self, outcomes, input_keys=[], output_keys=[]):
 
     ### Getter and Setter to allow pickling and unpickling state machines
     def __getstate__(self):
-        return {k:v for (k, v) in self.__dict__.items() if k is not "_state_transitioning_lock"}
+        return {k:v for (k, v) in self.__dict__.items() if k != "_state_transitioning_lock"}
 
     def __setstate__(self, d):
         self.__dict__ = d
diff --git a/smach_ros/setup.cfg b/smach_ros/setup.cfg
index 97e893c..3b90c58 100644
--- a/smach_ros/setup.cfg
+++ b/smach_ros/setup.cfg
@@ -1,4 +1,4 @@
 [develop]
-script-dir=$base/lib/smach_ros
+script_dir=$base/lib/smach_ros
 [install]
-install-scripts=$base/lib/smach_ros
+install_scripts=$base/lib/smach_ros
diff --git a/smach_ros/setup.py b/smach_ros/setup.py
index ee3b4cf..305b5c6 100644
--- a/smach_ros/setup.py
+++ b/smach_ros/setup.py
@@ -13,12 +13,7 @@
     zip_safe=True,
     maintainer='Isaac I. Y. Saito',
     maintainer_email='gm130s@gmail.com',
-    description='''
-        SMACH is a task-level architecture for rapidly creating complex robot
-        behavior. At its core, SMACH is a ROS-independent Python library to build
-        hierarchical state machines. SMACH is a new library that takes advantage of
-        very old concepts in order to quickly create robust robot behavior with
-        maintainable and modular code.''',
+    description='''SMACH is a task-level architecture for rapidly creating complex robot behavior. At its core, SMACH is a ROS-independent Python library to build hierarchical state machines. SMACH is a new library that takes advantage of very old concepts in order to quickly create robust robot behavior with maintainable and modular code.''',
     license='BSD',
     data_files=[
         ('share/ament_index/resource_index/packages',