diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 515007e4..a04704f3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11", "pypy-3.8"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8"]
         pyyaml-version: ["5.1.*", "5.4.*", "6.0.*", "6.*"]
         exclude:
           - python-version: 2.7
@@ -63,7 +63,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["2.7", "3.6", "3.7", "3.8", "3.9", "3.10", "3.11.0-alpha - 3.11", "pypy-3.8"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11", "pypy-3.8"]
 
     steps:
     - name: Checkout working copy
diff --git a/setup.py b/setup.py
index eb7f99e0..afd831e0 100644
--- a/setup.py
+++ b/setup.py
@@ -200,7 +200,7 @@ class sdist(_sdist):
 
 setup(
     name="ua-parser",
-    version="0.16.1",
+    version="0.18.0",
     description="Python port of Browserscope's user agent parser",
     author="PBS",
     author_email="no-reply@pbs.org",
diff --git a/uap-core b/uap-core
index 7b002982..d668d6c6 160000
--- a/uap-core
+++ b/uap-core
@@ -1 +1 @@
-Subproject commit 7b002982f688dd11a23478cd1e101d2c72b2c0e7
+Subproject commit d668d6c6157db7737edfc0280adc6610c1b88029