diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 2510147c5b4..67d1dd57fa3 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -671,9 +671,6 @@ jobs:
       Bionic:
         deb_system: ubuntu
         distro: bionic
-      Eoan:
-        deb_system: ubuntu
-        distro: eoan
       Focal:
         deb_system: ubuntu
         distro: focal
diff --git a/scripts/release/debian/test_deb_in_docker.sh b/scripts/release/debian/test_deb_in_docker.sh
index 4a343fbd6fd..137e4839502 100644
--- a/scripts/release/debian/test_deb_in_docker.sh
+++ b/scripts/release/debian/test_deb_in_docker.sh
@@ -10,7 +10,7 @@ apt install -y apt-transport-https git gcc python3-dev
 
 # The distros that need libssl1.1
 case ${DISTRO} in
-    bionic|buster|eoan|focal|groovy) apt install -y libssl1.1;;
+    bionic|buster|focal|groovy) apt install -y libssl1.1;;
     *)                        :;;
 esac
 
diff --git a/src/azure-cli-core/setup.py b/src/azure-cli-core/setup.py
index df8e0aebc0d..3546c619377 100644
--- a/src/azure-cli-core/setup.py
+++ b/src/azure-cli-core/setup.py
@@ -45,7 +45,7 @@
 DEPENDENCIES = [
     'adal~=1.2.3',
     'argcomplete~=1.8',
-    'azure-cli-telemetry==1.0.6',
+    'azure-cli-telemetry==1.0.6.*',
     'colorama~=0.4.1',
     'humanfriendly>=4.7,<9.0',
     'jmespath',
diff --git a/src/azure-cli/setup.py b/src/azure-cli/setup.py
index 0b07894d341..c30436314df 100644
--- a/src/azure-cli/setup.py
+++ b/src/azure-cli/setup.py
@@ -53,7 +53,7 @@
     'antlr4-python3-runtime~=4.7.2',
     'azure-appconfiguration~=1.1.1',
     'azure-batch~=10.0.0',
-    'azure-cli-core=={}.*'.format(VERSION),
+    'azure-cli-core=={}.*'.format(".".join(VERSION.split(".")[:3])),
     'azure-cosmos~=3.0,>=3.0.2',
     'azure-datalake-store~=0.0.49',
     'azure-functions-devops-build~=0.0.22',