diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d78b49ba1a..818c72ac60 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -100,12 +100,12 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
       - name: Build eggs
-        run: python setup.py bdist_egg
+        run: make -f Makefile.gh build-egg
       - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.RELEASE_TOKEN }}
-          file: ${{ github.workspace }}/dist/avocado_framework*
+          file: ${{ github.workspace }}/EGG_UPLOAD/avocado_framework*egg
           tag: ${{ github.event.inputs.version }}
           overwrite: true
           file_glob: true
diff --git a/optional_plugins/varianter_pict/MANIFEST.in b/optional_plugins/varianter_pict/MANIFEST.in
index ceeea233fc..88c0d60cef 100644
--- a/optional_plugins/varianter_pict/MANIFEST.in
+++ b/optional_plugins/varianter_pict/MANIFEST.in
@@ -1 +1 @@
-include VERSION
+include VERSION README.rst
diff --git a/python-avocado.spec b/python-avocado.spec
index 2cf833e86f..7512f642e2 100644
--- a/python-avocado.spec
+++ b/python-avocado.spec
@@ -28,7 +28,7 @@
 Summary: Framework with tools and libraries for Automated Testing
 Name: python-avocado
 Version: 102.0
-Release: 1%{?gitrel}%{?dist}
+Release: 2%{?gitrel}%{?dist}
 License: GPLv2+ and GPLv2 and MIT
 URL: https://avocado-framework.github.io/
 %if 0%{?rel_build}
@@ -66,7 +66,6 @@ BuildRequires: python3-yaml
 BuildRequires: python3-netifaces
 %if ! 0%{?rhel}
 BuildRequires: perl-Test-Harness
-BuildRequires: python3-elementpath
 BuildRequires: python3-xmlschema
 %endif
 BuildRequires: zstd
@@ -409,6 +408,9 @@ Again Shell code (and possibly other similar shells).
 %{_libexecdir}/avocado*
 
 %changelog
+* Tue Jul 18 2023 Cleber Rosa <crosa@redhat.com> - 102.0-2
+- Removed python3-elementpath build requirement
+
 * Fri Jun 23 2023 Cleber Rosa <crosa@redhat.com> - 102.0-1
 - New release
 
diff --git a/requirements-dev.txt b/requirements-dev.txt
index 997dc3ad0a..49884e5b7e 100644
--- a/requirements-dev.txt
+++ b/requirements-dev.txt
@@ -10,7 +10,6 @@ black==22.3.0
 coverage==5.5
 
 # To run make check
-aexpect==1.6.1
 psutil==5.8.0
 
 # pycdlib is an optional requirement in production
@@ -21,7 +20,6 @@ pycdlib==1.13.0
 netifaces==0.11.0
 
 # For tests that validate the produced XUnit output
-elementpath==2.3.2
 xmlschema==1.7.0
 
 # For building the manpage