diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
new file mode 100644
index 0000000..7312fff
--- /dev/null
+++ b/.github/workflows/main.yml
@@ -0,0 +1,16 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  industrial_ci:
+    strategy:
+      matrix:
+        env:
+          - {ROS_DISTRO: noetic, ROS_REPO: testing}
+          - {ROS_DISTRO: noetic, ROS_REPO: main}
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: 'ros-industrial/industrial_ci@master'
+        env: ${{matrix.env}}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 0c32515..0000000
--- a/.travis.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-sudo: required 
-dist: trusty 
-language: generic 
-compiler:
-  - gcc
-notifications:
-  email:
-    on_success: always
-    on_failure: always
-env:
-  matrix:
-    - USE_DEB=true  ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="indigo" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - USE_DEB=true  ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="kinetic" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-    - USE_DEB=true  ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-    - USE_DEB=true  ROS_DISTRO="lunar" ROS_REPOSITORY_PATH=http://packages.ros.org/ros-shadow-fixed/ubuntu
-install:
-  - git clone https://github.com/ros-industrial/industrial_ci.git .ci_config
-matrix:
-  allow_failures:
-    - env: ROS_REPOSITORY_PATH=http://packages.ros.org/ros/ubuntu
-script: 
-  - source .ci_config/travis.sh
-#  - source ./travis.sh  # Enable this when you have a package-local script 
diff --git a/gps_common/package.xml b/gps_common/package.xml
index 5ede991..b5d868a 100644
--- a/gps_common/package.xml
+++ b/gps_common/package.xml
@@ -4,8 +4,9 @@
   <version>0.3.4</version>
   <description>GPS messages and common routines for use in GPS drivers</description>
 
-  <maintainer email="timo.roehling@fkie.fraunhofer.de">Timo Roehling</maintainer>
-  <maintainer email="preed@swri.org">P. J. Reed</maintainer>
+  <author email="timo.roehling@fkie.fraunhofer.de">Timo Roehling</author>
+  <author email="preed@swri.org">P. J. Reed</author>
+  <maintainer email="swri-robotics@swri.org">Southwest Research Institute</maintainer>
   <license>BSD</license>
   <url type="website">http://ros.org/wiki/gps_common</url>
 
diff --git a/gps_umd/package.xml b/gps_umd/package.xml
index 0acfa76..50aa502 100644
--- a/gps_umd/package.xml
+++ b/gps_umd/package.xml
@@ -4,8 +4,9 @@
   <version>0.3.4</version>
   <description>gps_umd metapackage</description>
 
-  <maintainer email="ken@tossell.net">Ken Tossell</maintainer>
-  <maintainer email="preed@swri.org">P. J. Reed</maintainer>
+  <author email="ken@tossell.net">Ken Tossell</author>
+  <author email="preed@swri.org">P. J. Reed</author>
+  <maintainer email="swri-robotics@swri.org">Southwest Research Institute</maintainer>
 
   <license>BSD</license>
 
diff --git a/gpsd_client/package.xml b/gpsd_client/package.xml
index b536431..1e5edac 100644
--- a/gpsd_client/package.xml
+++ b/gpsd_client/package.xml
@@ -5,10 +5,11 @@
   <description>connects to a GPSd server and broadcasts GPS fixes 
    using the NavSatFix message</description>
 
-  <maintainer email="timo.roehling@fkie.fraunhofer.de">Timo Roehling</maintainer>
-  <maintainer email="preed@swri.org">P. J. Reed</maintainer>
   <author email="ken@tossell.net">Ken Tossell</author>
   <author email="rob@umd.edu">Rob Thomson</author>
+  <author email="timo.roehling@fkie.fraunhofer.de">Timo Roehling</author>
+  <author email="preed@swri.org">P. J. Reed</author>
+  <maintainer email="swri-robotics@swri.org">Southwest Research Institute</maintainer>
 
   <license>BSD</license>
   <url type="website">http://ros.org/wiki/gpsd_client</url>