diff --git a/elements/amphora-agent/pkg-map b/elements/amphora-agent/pkg-map
index 501231d7f8..de5f01a84a 100644
--- a/elements/amphora-agent/pkg-map
+++ b/elements/amphora-agent/pkg-map
@@ -20,6 +20,17 @@
         "vlan": "",
         "screen": "",
         "dkms": ""
+      },
+      "9-stream": {
+        "debootstrap": "",
+        "isc-dhcp-client": "dhcp-client",
+        "python3-dev": "platform-python-devel",
+        "python3-venv": "",
+        "python3": "python39",
+        "vlan": "",
+        "screen": "",
+        "dkms": "",
+        "network-scripts": ""
       }
     },
     "ubuntu": {
diff --git a/elements/haproxy-octavia/pre-install.d/01-repositories b/elements/haproxy-octavia/pre-install.d/01-repositories
index 03ee47286d..e553cbe67b 100755
--- a/elements/haproxy-octavia/pre-install.d/01-repositories
+++ b/elements/haproxy-octavia/pre-install.d/01-repositories
@@ -3,7 +3,7 @@
 set -eu
 set -o xtrace
 
-if [ "$DISTRO_NAME" == "centos" ]; then
+if [[ "$DISTRO_NAME" == "centos" && "$DIB_RELEASE" == "8" ]]; then
     dnf install -y dnf-plugins-core centos-release-nfv-common
     # REVISIT(cgoncalves): replace arch if-else + GPG with release RPM once available
     if [[ "$ARCH" =~ (aarch64|arm64) ]]; then