diff --git a/.github/workflows/black.yml b/.github/workflows/black.yml
deleted file mode 100644
index 07899a1..0000000
--- a/.github/workflows/black.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-# Based on https://black.readthedocs.io/en/stable/integrations/github_actions.html
-
-name: Lint
-
-on: [ push, pull_request ]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: psf/black@stable
diff --git a/.github/workflows/ruff.yml b/.github/workflows/ruff.yml
new file mode 100644
index 0000000..ef06d34
--- /dev/null
+++ b/.github/workflows/ruff.yml
@@ -0,0 +1,8 @@
+name: Ruff
+on: [ push, pull_request ]
+jobs:
+  ruff:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: chartboost/ruff-action@v1
diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml
index df928c3..1ad50e2 100644
--- a/.github/workflows/validation.yml
+++ b/.github/workflows/validation.yml
@@ -17,10 +17,10 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: Set up Python 3.9
+    - name: Set up Python 3.11
       uses: actions/setup-python@v4
       with:
-        python-version: 3.9
+        python-version: 3.11
 
     - name: Install requirements
       run: pip install -r requirements.txt
diff --git a/README.md b/README.md
index 4eae0d4..b3e074f 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 Copyright 2022-2024 IIASA
 
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
+[![Ruff](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/ruff/main/assets/badge/v2.json)](https://github.com/astral-sh/ruff)
 
 ## Overview
 
diff --git a/nomenclature.yaml b/nomenclature.yaml
index 854a7f4..a56b957 100644
--- a/nomenclature.yaml
+++ b/nomenclature.yaml
@@ -1,7 +1,7 @@
 repositories:
   common-definitions:
     url: https://github.com/IAMconsortium/common-definitions.git/
-    hash: 013295a
+    hash: 23b2833
 definitions:
   region:
     repository: common-definitions
diff --git a/requirements.txt b/requirements.txt
index 70a15e3..28c9cfc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1 @@
-pyam-iamc >= 1.0  # the `pyam` package is released on pypi under this name
-nomenclature-iamc >= 0.11
+nomenclature-iamc >= 0.19.0  # use the latest release on PyPI