diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9f2a178519..87b031f031 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -86,19 +86,19 @@ jobs:
         python -m pip install --upgrade pip setuptools wheel
         python -m pip install cibuildwheel==2.21.2
 
-    # Hack: cmake --trace-expand
-    #- name: Download Patch 2/2
-    #  uses: suisei-cn/actions-download-file@v1
-    #  id: setupversion
-    #  with:
-    #    url: "https://gist.githubusercontent.com/ax3l/9b15c5bc73d7f3c1c66784187a016474/raw/e31dd54498c9c8fc465a7cbb6f900f768b9d0c0b/0001-Hack-setup.py-CMake-trace-expand.patch"
-    #    target: src/.patch/
-
-    #- name: Apply Patches
-    #  run: |
-    #    python -m pip install patch
-    #    cd src
-    #    python -m patch .patch/0001-Hack-setup.py-CMake-trace-expand.patch
+    # Patch: Fix versioning
+    - name: Download Patch 1/1
+      uses: suisei-cn/actions-download-file@818d6b7dc8fe73f2f924b6241f2b1134ca1377d9  # 1.6.0
+      id: setupversion
+      with:
+        url: "https://github.com/openPMD/openPMD-api/pull/1680.patch?full_index=1"
+        target: src/.patch/
+
+    - name: Apply Patches
+      run: |
+        python -m pip install patch
+        cd src
+        python -m patch .patch/1680.patch?full_index=1
 
     - name: Build wheel
       env:
diff --git a/.travis.yml b/.travis.yml
index 1e28d70757..260e083695 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -144,19 +144,13 @@ install:
   - python -m pip install patch
 
 # Download & Apply Patches
-#before_script:
-#  - mkdir -p src/.patch
-#  - cd src/.patch
-#  - curl -sOL https://github.com/ax3l/openPMD-api/commit/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch
-#  - curl -sOL https://github.com/ax3l/openPMD-api/commit/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch
-#  - curl -sOL https://github.com/ax3l/openPMD-api/commit/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch
-#  - curl -sOL https://gist.githubusercontent.com/ax3l/5e83edefe4b05cf6aa2a971649285fe0/raw/023cbd69e06715e5191ece741bb1de56560a9f96/0001-Bump-setup.py.patch
-#  - cd ..
-#  - python -m patch .patch/b622cc5ea770f866c1e373185a9e389c04bdb54c.patch
-#  - python -m patch .patch/a1aac530dbc8261656cf6a07900374bc6ac6fcab.patch
-#  - python -m patch .patch/43c4bf4327616e9cf7e7992d91d9b8ccd4ee3a83.patch
-#  - python -m patch .patch/0001-Bump-setup.py.patch
-#  - cd ..
+before_script:
+  - mkdir -p src/.patch
+  - cd src/.patch
+  - curl -sOL https://github.com/openPMD/openPMD-api/pull/1680.patch?full_index=1
+  - cd ..
+  - python -m patch .patch/1680.patch?full_index=1
+  - cd ..
 
 script:
   - cd src