diff --git a/.github/workflows/linux-ci.yml b/.github/workflows/linux-ci.yml
index dd7417b..b4e3468 100644
--- a/.github/workflows/linux-ci.yml
+++ b/.github/workflows/linux-ci.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
+        python-version: [3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
         kokkos-branch: ['master', 'develop']
 
     steps:
@@ -82,7 +82,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
+        python-version: [3.7, 3.8, 3.9, 'pypy-3.6', 'pypy-3.7']
         kokkos-branch: ['master']
 
     steps:
@@ -144,7 +144,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9, "3.10", "3.11"]
+        python-version: [3.7, 3.8, 3.9, "3.10", "3.11"]
         kokkos-branch: ['develop']
 
     steps:
@@ -163,7 +163,7 @@ jobs:
         python -m pip install 'cmake==3.20.2'
 
     - name: Install Kokkos
-      if: ${{ matrix.python-version != '3.6' && matrix.python-version != '3.7' }}
+      if: ${{ matrix.python-version != '3.7' }}
       run:
         git clone -b ${{ matrix.kokkos-branch }} https://github.com/kokkos/kokkos.git /tmp/kokkos-source &&
         cmake -B /tmp/kokkos-build
diff --git a/.github/workflows/python-package.yml b/.github/workflows/python-package.yml
index 7da8ffe..2dbc437 100644
--- a/.github/workflows/python-package.yml
+++ b/.github/workflows/python-package.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.6, 3.7, 3.8, 3.9]
+        python-version: [3.7, 3.8, 3.9]
 
     steps:
     - uses: actions/checkout@v2
diff --git a/external/kokkos b/external/kokkos
index 61d7db5..1a0c2ff 160000
--- a/external/kokkos
+++ b/external/kokkos
@@ -1 +1 @@
-Subproject commit 61d7db55fceac3318c987a291f77b844fd94c165
+Subproject commit 1a0c2ff6daf1068c65529ec04c2c046177847869