diff --git a/.zuul.yaml b/.zuul.yaml
index f5c4719b..feaf2d27 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,18 +1,18 @@
 - project:
     templates:
       - openstack-cover-jobs
-      - check-requirements
       - release-notes-jobs-python3
-      - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
     check:
       jobs:
         - cyborg-tempest
         - cyborg-tempest-ipv6-only
         - cyborg-tox-bandit
+        - openstack-tox-py38
     gate:
       jobs:
         - cyborg-tempest
+        - openstack-tox-py38
 
 - job:
     name: cyborg-tox-bandit
diff --git a/releasenotes/notes/drop-py-3-6-and-3-7--37951d4a79dffdbd.yaml b/releasenotes/notes/drop-py-3-6-and-3-7--37951d4a79dffdbd.yaml
new file mode 100644
index 00000000..728bc202
--- /dev/null
+++ b/releasenotes/notes/drop-py-3-6-and-3-7--37951d4a79dffdbd.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    In zed cycle, OpenStack projects and oslo lib has dropped the py3.6
+    and py3.7 support `[1]`_, Cyborg also not supporting the py3.6 and py3.7,
+    Cyborg master is failing and cannot be run on py3.6|7 env.
+    So from Zed release, we will remove py3.6 and py3.7 env.
+
+    .. _[1]: https://governance.openstack.org/tc/reference/runtimes/zed.html
diff --git a/setup.cfg b/setup.cfg
index e4c83d89..fd8f6b33 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/cyborg/latest/
-python_requires = >=3.6
+python_requires = >=3.8
 classifier =
     Environment :: OpenStack
     Intended Audience :: Information Technology
@@ -17,8 +17,6 @@ classifier =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.6
-    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9