diff --git a/hooks/build b/hooks/build
index 2dff4463e2665..be8fcd61b8986 100755
--- a/hooks/build
+++ b/hooks/build
@@ -176,7 +176,7 @@ else
 fi
 
 # Extras used to build cache and CI image
-AIRFLOW_CI_EXTRAS=${AIRFLOW_CI_EXTRAS:="devel_ci"}
+AIRFLOW_CI_EXTRAS=${AIRFLOW_CI_EXTRAS:="devel_all"}
 
 # Whether this is a release build
 AIRFLOW_RELEASE_BUILD=${AIRFLOW_RELEASE_BUILD:="false"}
@@ -419,7 +419,7 @@ else
     build_python_image "Airflow CI" \
                 "${AIRFLOW_CI_IMAGE}" \
                 "main" \
-                "devel_ci" \
+                "devel_all" \
                 "root" \
                 "/root"
 
diff --git a/setup.py b/setup.py
index 0bd35a73d6f84..a8682a0697722 100644
--- a/setup.py
+++ b/setup.py
@@ -242,7 +242,7 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
     'grpcio>=1.15.0',
 ]
 hdfs = [
-    'snakebite>=2.7.8',
+    'snakebite-py3>=3.0.5',
 ]
 hive = [
     'hmsclient>=0.1.0',
@@ -260,7 +260,7 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
 kerberos = [
     'pykerberos>=1.1.13',
     'requests_kerberos>=0.10.0',
-    'snakebite[kerberos]>=2.7.8',
+    'snakebite-py3[kerberos]>=3.0.5',
     'thrift_sasl>=0.2.0',
 ]
 kubernetes = [
@@ -416,13 +416,6 @@ def write_version(filename: str = os.path.join(*["airflow", "git_version"])):
              password + pinot + redis + salesforce + samba + segment + sendgrid +
              sentry + slack + snowflake + ssh + virtualenv + webhdfs + zendesk)
 
-# Snakebite & Google Cloud Dataflow are not Python 3 compatible :'(
-if PY3:
-    devel_ci = [package for package in devel_all if package not in
-                ['snakebite>=2.7.8', 'snakebite[kerberos]>=2.7.8']]
-else:
-    devel_ci = devel_all
-
 
 def do_setup():
     """Perform the Airflow package setup."""
@@ -518,7 +511,6 @@ def do_setup():
             'databricks': databricks,
             'datadog': datadog,
             'devel': devel_minreq,
-            'devel_ci': devel_ci,
             'devel_hadoop': devel_hadoop,
             'doc': doc,
             'docker': docker,